diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2017-09-21 21:51:11 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-09-21 21:51:11 +0000 |
commit | b392d040c6be4592b169fa5cccf46ad0a1dcb9ac (patch) | |
tree | 838d38915e49ecc2ea53566290e56525861105d0 | |
parent | 21436fa04d317a016fdf33396592431312d65edd (diff) | |
parent | f62ddedc95c982487dc3f7849329f319f02eb46f (diff) | |
download | swiftshader-oreo-m6-s2-release.tar.gz |
release-request-a84b3435-75fa-41e8-bd3c-ca0f4cbd5cc5-for-git_oc-m2-release-4352002 snap-temp-L88700000105039240android-8.1.0_r8android-8.1.0_r52android-8.1.0_r50android-8.1.0_r47android-8.1.0_r46android-8.1.0_r43android-8.1.0_r41android-8.1.0_r36android-8.1.0_r35android-8.1.0_r33android-8.1.0_r30android-8.1.0_r26android-8.1.0_r25android-8.1.0_r20android-8.1.0_r2oreo-m7-releaseoreo-m6-s4-releaseoreo-m6-s3-releaseoreo-m6-s2-releaseoreo-m2-s5-releaseoreo-m2-s4-releaseoreo-m2-s3-releaseoreo-m2-s2-releaseoreo-m2-s1-releaseoreo-m2-release
Change-Id: Iff7dbbc4e2f59d0a8c9413bf146fcd6d02ccbacf
-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) |