diff options
| author | Alan Viverette <alanv@google.com> | 2017-05-02 17:54:20 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-02 17:54:20 +0000 |
| commit | e326b4e0375ba6c791e06ef9cd8d5c8d3c97eed1 (patch) | |
| tree | 251ea56289c13631d963ad1ed6ffa67205b81dac | |
| parent | 8cba9aeecdbc0ab15f81da56075e0f4fa93b7269 (diff) | |
| parent | 69c572d8034ba1ffb7fe6e21270c110f0c7b64d4 (diff) | |
| download | Camera2-e326b4e0375ba6c791e06ef9cd8d5c8d3c97eed1.tar.gz | |
Merge "Revert "Include v4, use AAPT2"" into oc-dev am: 487830bbcf
am: 69c572d803
Change-Id: Ic99f16c26b8317748d47336729a57c5e9fdb474a
| -rw-r--r-- | Android.mk | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Android.mk b/Android.mk index 28785f7f6..745a2ad67 100644 --- a/Android.mk +++ b/Android.mk @@ -4,10 +4,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := optional -LOCAL_STATIC_ANDROID_LIBRARIES := \ - android-support-v4 \ - android-support-v13 - +LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13 LOCAL_STATIC_JAVA_LIBRARIES += android-ex-camera2-portability LOCAL_STATIC_JAVA_LIBRARIES += xmp_toolkit LOCAL_STATIC_JAVA_LIBRARIES += glide @@ -22,7 +19,6 @@ LOCAL_RESOURCE_DIR += \ $(LOCAL_PATH)/res \ $(LOCAL_PATH)/res_p -LOCAL_USE_AAPT2 := true include $(LOCAL_PATH)/version.mk LOCAL_AAPT_FLAGS := \ |