diff options
| author | hansson <hansson@google.com> | 2018-02-23 07:24:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-02-23 07:24:28 +0000 |
| commit | 4e4414c8758020142f5d6635c73d644953a88eef (patch) | |
| tree | 3eeebf7addc1d96dc55bf238d55cb33e532763f9 | |
| parent | d9b005b4c996467195ac69451820f545efdec641 (diff) | |
| parent | 7d194af48aaea397b1606e1d99a8505fa00cf30c (diff) | |
| download | LegacyCamera-o-mr1-iot-preview-7.tar.gz | |
Merge "packages/apps/LegacyCamera: Set LOCAL_SDK_VERSION where possible."android-wear-p-preview-2android-p-preview-5android-p-preview-4android-p-preview-3android-p-preview-2android-p-preview-1android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7o-mr1-iot-preview-8o-mr1-iot-preview-7
| -rw-r--r-- | Android.mk | 1 | ||||
| -rw-r--r-- | tests/Android.mk | 1 |
2 files changed, 2 insertions, 0 deletions
@@ -7,6 +7,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := LegacyCamera #LOCAL_SDK_VERSION := current +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_JNI_SHARED_LIBRARIES := libjni_legacymosaic diff --git a/tests/Android.mk b/tests/Android.mk index baf1103a..24d4c1ca 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -11,6 +11,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := LegacyCameraTests +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_INSTRUMENTATION_FOR := LegacyCamera |