Android-x86
Fork

  • R/O
  • HTTP
  • SSH
  • HTTPS

packages-apps-Camera2: コミット

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

変更サマリ

差分

--- a/Android.mk
+++ b/Android.mk
@@ -4,7 +4,10 @@ include $(CLEAR_VARS)
44
55 LOCAL_MODULE_TAGS := optional
66
7-LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13
7+LOCAL_STATIC_ANDROID_LIBRARIES := \
8+ android-support-v4 \
9+ android-support-v13
10+
811 LOCAL_STATIC_JAVA_LIBRARIES += android-ex-camera2-portability
912 LOCAL_STATIC_JAVA_LIBRARIES += xmp_toolkit
1013 LOCAL_STATIC_JAVA_LIBRARIES += glide
@@ -19,6 +22,7 @@ LOCAL_RESOURCE_DIR += \
1922 $(LOCAL_PATH)/res \
2023 $(LOCAL_PATH)/res_p
2124
25+LOCAL_USE_AAPT2 := true
2226
2327 include $(LOCAL_PATH)/version.mk
2428 LOCAL_AAPT_FLAGS := \
旧リポジトリブラウザで表示