diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-12-28 08:24:17 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-12-28 08:24:17 +0000 |
| commit | 0824db9ef0067d85ba76ec088c6c3b175ccaf0ef (patch) | |
| tree | 256d681c8a15165facd99993a5373518ba45c596 | |
| parent | 61c2dbfd59f50d6b92b64a945eebff04a17bf61c (diff) | |
| parent | a08a6a4202e546361a9334f803de7427a87de9c7 (diff) | |
| download | easel-0824db9ef0067d85ba76ec088c6c3b175ccaf0ef.tar.gz | |
Snap for 4519870 from a08a6a4202e546361a9334f803de7427a87de9c7 to pi-releaseandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-security-9.0.0_r76android-security-9.0.0_r75android-security-9.0.0_r74android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-platform-releasepie-gsipie-cuttlefish-testingpie-cts-release
Change-Id: I6a4d9af9dabf9f3be7cccb6ffb005c3478ea8857
| -rw-r--r-- | amber/camera/libhdrplusclient/Android.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/amber/camera/libhdrplusclient/Android.mk b/amber/camera/libhdrplusclient/Android.mk index 18db0ac..249111a 100644 --- a/amber/camera/libhdrplusclient/Android.mk +++ b/amber/camera/libhdrplusclient/Android.mk @@ -29,9 +29,13 @@ LOCAL_SHARED_LIBRARIES := liblog ifeq ($(wildcard vendor/google_easel),) LOCAL_CFLAGS += -DUSE_DUMMY_IMPL=1 else +ifneq ($(TARGET_EASEL_VARIANT), amber) + LOCAL_CFLAGS += -DUSE_DUMMY_IMPL=1 +else LOCAL_CFLAGS += -DUSE_DUMMY_IMPL=0 LOCAL_SHARED_LIBRARIES += libhdrplusclientimpl endif +endif LOCAL_HEADER_LIBRARIES := \ libsystem_headers \ |