packages/apps/Camera2
リビジョン | a09a333fd27fb5e2ccc65c65c9cca7e4785d4cce (tree) |
---|---|
日時 | 2017-05-02 22:11:23 |
作者 | TreeHugger Robot <treehugger-gerrit@goog...> |
コミッター | Android (Google) Code Review |
Merge "Include v4, use AAPT2" into oc-dev
@@ -4,7 +4,10 @@ include $(CLEAR_VARS) | ||
4 | 4 | |
5 | 5 | LOCAL_MODULE_TAGS := optional |
6 | 6 | |
7 | -LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13 | |
7 | +LOCAL_STATIC_ANDROID_LIBRARIES := \ | |
8 | + android-support-v4 \ | |
9 | + android-support-v13 | |
10 | + | |
8 | 11 | LOCAL_STATIC_JAVA_LIBRARIES += android-ex-camera2-portability |
9 | 12 | LOCAL_STATIC_JAVA_LIBRARIES += xmp_toolkit |
10 | 13 | LOCAL_STATIC_JAVA_LIBRARIES += glide |
@@ -19,6 +22,7 @@ LOCAL_RESOURCE_DIR += \ | ||
19 | 22 | $(LOCAL_PATH)/res \ |
20 | 23 | $(LOCAL_PATH)/res_p |
21 | 24 | |
25 | +LOCAL_USE_AAPT2 := true | |
22 | 26 | |
23 | 27 | include $(LOCAL_PATH)/version.mk |
24 | 28 | LOCAL_AAPT_FLAGS := \ |