diff options
| author | Yifan Hong <elsk@google.com> | 2017-06-09 22:19:23 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-09 22:19:23 +0000 |
| commit | 8117f8d7328bc3d2d6b46c87a5c5a847e9acb420 (patch) | |
| tree | 1191c71e473773a7cb2caf4c645ba55548bf482a | |
| parent | f351fb532761dabe00ba9b8b31cab8f462d3c05d (diff) | |
| parent | a5d5117675a362e13b8d6c01909eccba811cda83 (diff) | |
| download | device_generic_goldfish-opengl-8117f8d7328bc3d2d6b46c87a5c5a847e9acb420.tar.gz device_generic_goldfish-opengl-8117f8d7328bc3d2d6b46c87a5c5a847e9acb420.tar.bz2 device_generic_goldfish-opengl-8117f8d7328bc3d2d6b46c87a5c5a847e9acb420.zip | |
Fix aosp_arm build for ODR am: 22dd0fee8f
am: a5d5117675
Change-Id: I4b617bbbd3e9022c753ec5452408c8e872614f19
| -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 |