Fix aosp_arm build for ODR
POST_O should include ODR as well. CODENAME.PPR is
not defined.
Test: m -j
Fixes: 62435156
Change-Id: I72c8023ec1328cea06fe12bc7b4c8480da8ad7c6
diff --git a/Android.mk b/Android.mk
index a53f072..31db4f2 100644
--- a/Android.mk
+++ b/Android.mk
@@ -28,7 +28,7 @@
EMUGL_COMMON_CFLAGS += -DGOLDFISH_HIDL_GRALLOC
endif
-ifeq ($(PLATFORM_VERSION_CODENAME.PPR1),P)
+ifdef IS_AT_LEAST_OPD1
EMUGL_COMMON_CFLAGS += -DEMULATOR_OPENGL_POST_O=1
endif
diff --git a/common.mk b/common.mk
index 81f558b..c15812e 100644
--- a/common.mk
+++ b/common.mk
@@ -106,8 +106,8 @@
STATIC_LIBRARIES \
ADDITIONAL_DEPENDENCIES
-ifeq ($(PLATFORM_VERSION_CODENAME.PPR1),P)
-EMUGL_EXPORT_TYPES += HEADER_LIBRARIES
+ifdef IS_AT_LEAST_OPD1
+EMUGL_EXPORT_TYPES += HEADER_LIBRARIES
endif
# Initialize a module in our database
diff --git a/system/OpenglSystemCommon/Android.mk b/system/OpenglSystemCommon/Android.mk
index 007b503..71d851f 100644
--- a/system/OpenglSystemCommon/Android.mk
+++ b/system/OpenglSystemCommon/Android.mk
@@ -11,7 +11,7 @@
QemuPipeStream.cpp \
ThreadInfo.cpp
-ifeq ($(PLATFORM_VERSION_CODENAME.PPR1),P)
+ifdef IS_AT_LEAST_OPD1
LOCAL_HEADER_LIBRARIES += libnativebase_headers
$(call emugl-export,HEADER_LIBRARIES,libnativebase_headers)
diff --git a/system/egl/Android.mk b/system/egl/Android.mk
index 476cf94..0c7317a 100644
--- a/system/egl/Android.mk
+++ b/system/egl/Android.mk
@@ -13,7 +13,7 @@
egl.cpp \
ClientAPIExts.cpp
-ifeq ($(PLATFORM_VERSION_CODENAME.PPR1),P)
+ifdef IS_AT_LEAST_OPD1
LOCAL_SHARED_LIBRARIES += libdl libnativewindow
else
LOCAL_SHARED_LIBRARIES += libdl