diff options
| author | Yifan Hong <elsk@google.com> | 2017-06-08 17:17:17 -0700 |
|---|---|---|
| committer | Yifan Hong <elsk@google.com> | 2017-06-09 11:08:49 -0700 |
| commit | 22dd0fee8fac517021e9f7d970da70a7b9803385 (patch) | |
| tree | d1d9a9f0af5f525796dc1111e30766ab1ddad02a | |
| parent | 73cb02262b956368078fafa453a0be77de3b3080 (diff) | |
| download | device_generic_goldfish-opengl-22dd0fee8fac517021e9f7d970da70a7b9803385.tar.gz device_generic_goldfish-opengl-22dd0fee8fac517021e9f7d970da70a7b9803385.tar.bz2 device_generic_goldfish-opengl-22dd0fee8fac517021e9f7d970da70a7b9803385.zip | |
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
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | common.mk | 4 | ||||
| -rw-r--r-- | system/OpenglSystemCommon/Android.mk | 2 | ||||
| -rw-r--r-- | system/egl/Android.mk | 2 |
4 files changed, 5 insertions, 5 deletions
@@ -28,7 +28,7 @@ ifeq (O, $(PLATFORM_VERSION_CODENAME)) 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 @@ -106,8 +106,8 @@ EMUGL_EXPORT_TYPES := \ 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 007b5039..71d851f6 100644 --- a/system/OpenglSystemCommon/Android.mk +++ b/system/OpenglSystemCommon/Android.mk @@ -11,7 +11,7 @@ LOCAL_SRC_FILES := \ 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 476cf948..0c7317a7 100644 --- a/system/egl/Android.mk +++ b/system/egl/Android.mk @@ -13,7 +13,7 @@ LOCAL_SRC_FILES := \ 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 |