diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-11-28 23:42:26 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-11-28 23:42:26 +0000 |
| commit | f044feb104754c6d7cc064c6178fee22d0b84024 (patch) | |
| tree | 838d38915e49ecc2ea53566290e56525861105d0 | |
| parent | 21436fa04d317a016fdf33396592431312d65edd (diff) | |
| parent | f62ddedc95c982487dc3f7849329f319f02eb46f (diff) | |
| download | swiftshader-oreo-m5-release.tar.gz | |
Snap for 4448085 from f62ddedc95c982487dc3f7849329f319f02eb46f to oc-m3-releaseandroid-8.1.0_r9android-8.1.0_r7android-8.1.0_r22android-8.1.0_r21android-8.1.0_r18android-8.1.0_r17android-8.1.0_r14android-8.1.0_r13oreo-m5-releaseoreo-m3-release
Change-Id: If7bbd647e3580fd9b7fc950da2480f3a82941390
| -rw-r--r-- | src/OpenGL/compiler/Android.mk | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/OpenGL/compiler/Android.mk b/src/OpenGL/compiler/Android.mk index 95b301847..65f503308 100644 --- a/src/OpenGL/compiler/Android.mk +++ b/src/OpenGL/compiler/Android.mk @@ -72,6 +72,13 @@ COMMON_SRC_FILES := \ ValidateLimitations.cpp \ ValidateSwitch.cpp \ +# liblog_headers is introduced from O +ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo O),O) +COMMON_HEADER_LIBRARIES := liblog_headers +else +COMMON_HEADER_LIBRARIES := +endif + include $(CLEAR_VARS) LOCAL_CLANG := true LOCAL_MODULE := swiftshader_compiler_release @@ -85,6 +92,7 @@ LOCAL_CFLAGS += \ -DANGLE_DISABLE_TRACE LOCAL_C_INCLUDES := $(COMMON_C_INCLUDES) LOCAL_SHARED_LIBRARIES := libcutils +LOCAL_HEADER_LIBRARIES := $(COMMON_HEADER_LIBRARIES) include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) @@ -102,4 +110,5 @@ LOCAL_CFLAGS += \ LOCAL_C_INCLUDES := $(COMMON_C_INCLUDES) LOCAL_SHARED_LIBRARIES := libcutils +LOCAL_HEADER_LIBRARIES := $(COMMON_HEADER_LIBRARIES) include $(BUILD_STATIC_LIBRARY) |