diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-09-19 07:25:10 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-09-19 07:25:10 +0000 |
| commit | f62ddedc95c982487dc3f7849329f319f02eb46f (patch) | |
| tree | 838d38915e49ecc2ea53566290e56525861105d0 | |
| parent | 21436fa04d317a016fdf33396592431312d65edd (diff) | |
| parent | e258c3e03a58c5541395502503be592af8004ca0 (diff) | |
| download | swiftshader-f62ddedc95c982487dc3f7849329f319f02eb46f.tar.gz | |
release-request-336ddfb0-c762-4bda-8684-20198669642d-for-git_oc-mr1-release-4346879 snap-temp-L51800000104038734android-wear-8.1.0_r1android-vts-8.1_r9android-vts-8.1_r8android-vts-8.1_r7android-vts-8.1_r6android-vts-8.1_r5android-vts-8.1_r4android-vts-8.1_r3android-vts-8.1_r14android-vts-8.1_r13android-vts-8.1_r12android-vts-8.1_r11android-vts-8.1_r10android-security-8.1.0_r93android-security-8.1.0_r92android-security-8.1.0_r91android-security-8.1.0_r90android-security-8.1.0_r89android-security-8.1.0_r88android-security-8.1.0_r87android-security-8.1.0_r86android-security-8.1.0_r85android-security-8.1.0_r84android-security-8.1.0_r83android-security-8.1.0_r82android-cts-8.1_r9android-cts-8.1_r8android-cts-8.1_r7android-cts-8.1_r6android-cts-8.1_r5android-cts-8.1_r4android-cts-8.1_r3android-cts-8.1_r25android-cts-8.1_r24android-cts-8.1_r23android-cts-8.1_r22android-cts-8.1_r21android-cts-8.1_r20android-cts-8.1_r2android-cts-8.1_r19android-cts-8.1_r18android-cts-8.1_r17android-cts-8.1_r16android-cts-8.1_r15android-cts-8.1_r14android-cts-8.1_r13android-cts-8.1_r12android-cts-8.1_r11android-cts-8.1_r10android-cts-8.1_r1android-8.1.0_r81android-8.1.0_r80android-8.1.0_r79android-8.1.0_r78android-8.1.0_r77android-8.1.0_r76android-8.1.0_r75android-8.1.0_r74android-8.1.0_r73android-8.1.0_r72android-8.1.0_r71android-8.1.0_r70android-8.1.0_r69android-8.1.0_r68android-8.1.0_r66android-8.1.0_r6android-8.1.0_r5android-8.1.0_r4android-8.1.0_r3android-8.1.0_r23android-8.1.0_r19android-8.1.0_r16android-8.1.0_r15android-8.1.0_r12android-8.1.0_r11android-8.1.0_r10android-8.1.0_r1security-oc-mr1-releaseoreo-mr1-wear-releaseoreo-mr1-vts-releaseoreo-mr1-security-releaseoreo-mr1-s1-releaseoreo-mr1-releaseoreo-mr1-cuttlefish-testingoreo-mr1-cts-releaseoreo-m4-s1-release
Change-Id: I1655f62e1a6357432cc3930d38f536c7582c0654
| -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) |