commit a5d5117675a362e13b8d6c01909eccba811cda83
author Yifan Hong <elsk@google.com> Fri Jun 09 22:06:22 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jun 09 22:06:22 2017 +0000
tree d1d9a9f0af5f525796dc1111e30766ab1ddad02a
parent 73cb02262b956368078fafa453a0be77de3b3080
parent 22dd0fee8fac517021e9f7d970da70a7b9803385

Fix aosp_arm build for ODR
am: 22dd0fee8f

Change-Id: I104b3b5f712e373491c8b871096dfb613d88989b

Android.mk

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
 

common.mk

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

system/OpenglSystemCommon/Android.mk

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)

system/egl/Android.mk

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