diff options
| author | Zhomart Mukhamejanov <zhomart@google.com> | 2018-06-14 01:56:47 +0200 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-06-14 01:56:47 +0200 |
| commit | 441f38e9e523ed78a1d71f3ad70c4195a955ef2d (patch) | |
| tree | 5a005b4b901f8f7d0312e5870937270dab9ccfde | |
| parent | Merge "minui: Add constness to GRSurface* in gr_get_{width,height}." am: 6dbdbbc8fe (diff) | |
| parent | Merge "updater_sample: add proguard.flags" (diff) | |
| download | android_bootable_recovery-441f38e9e523ed78a1d71f3ad70c4195a955ef2d.tar android_bootable_recovery-441f38e9e523ed78a1d71f3ad70c4195a955ef2d.tar.gz android_bootable_recovery-441f38e9e523ed78a1d71f3ad70c4195a955ef2d.tar.bz2 android_bootable_recovery-441f38e9e523ed78a1d71f3ad70c4195a955ef2d.tar.lz android_bootable_recovery-441f38e9e523ed78a1d71f3ad70c4195a955ef2d.tar.xz android_bootable_recovery-441f38e9e523ed78a1d71f3ad70c4195a955ef2d.tar.zst android_bootable_recovery-441f38e9e523ed78a1d71f3ad70c4195a955ef2d.zip | |
| -rw-r--r-- | updater_sample/Android.mk | 5 | ||||
| -rw-r--r-- | updater_sample/proguard.flags | 23 | ||||
| -rw-r--r-- | updater_sample/tests/Android.mk | 6 |
3 files changed, 28 insertions, 6 deletions
diff --git a/updater_sample/Android.mk b/updater_sample/Android.mk index 7662111b7..a5deee1c8 100644 --- a/updater_sample/Android.mk +++ b/updater_sample/Android.mk @@ -20,9 +20,8 @@ include $(CLEAR_VARS) LOCAL_PACKAGE_NAME := SystemUpdaterSample LOCAL_MODULE_TAGS := samples LOCAL_SDK_VERSION := system_current - -# TODO: enable proguard and use proguard.flags file -LOCAL_PROGUARD_ENABLED := disabled +LOCAL_PRIVILEGED_MODULE := true +LOCAL_PROGUARD_FLAG_FILES := proguard.flags LOCAL_SRC_FILES := $(call all-java-files-under, src) diff --git a/updater_sample/proguard.flags b/updater_sample/proguard.flags new file mode 100644 index 000000000..5883608d7 --- /dev/null +++ b/updater_sample/proguard.flags @@ -0,0 +1,23 @@ +# Copyright (C) 2018 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Keep, used in tests. +-keep public class com.example.android.systemupdatersample.UpdateManager { + public int getUpdaterState(); +} + +# Keep, used in tests. +-keep public class com.example.android.systemupdatersample.UpdateConfig { + public <init>(java.lang.String, java.lang.String, int); +} diff --git a/updater_sample/tests/Android.mk b/updater_sample/tests/Android.mk index 9aec372e3..415760454 100644 --- a/updater_sample/tests/Android.mk +++ b/updater_sample/tests/Android.mk @@ -22,10 +22,10 @@ LOCAL_SDK_VERSION := system_current LOCAL_MODULE_TAGS := tests LOCAL_JAVA_LIBRARIES := \ android.test.base.stubs \ - android.test.runner.stubs \ - guava + android.test.runner.stubs LOCAL_STATIC_JAVA_LIBRARIES := android-support-test \ - mockito-target-minus-junit4 + mockito-target-minus-junit4 \ + guava LOCAL_INSTRUMENTATION_FOR := SystemUpdaterSample LOCAL_PROGUARD_ENABLED := disabled |