diff options
| author | Colin Cross <ccross@android.com> | 2019-07-29 20:37:59 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-07-29 20:37:59 -0700 |
| commit | 272bae01a7321645d34bb84c4b2ecd057d81adb0 (patch) | |
| tree | 6723cefa5e18b86b76a975570c4660d2f45645cb /packages/MtpDocumentsProvider | |
| parent | 443c5edeea615aab25f129bc6959f753077fc848 (diff) | |
| parent | aa98bac24bd875bbcd338b22243b6a40ba2b322b (diff) | |
Merge "Convert more of frameworks/base/packages to Android.bp" into stage-aosp-master am: ba9073a6a8 am: 97c07ce018 am: 7d089ac5ae
am: aa98bac24b
Change-Id: Iefbb6eeb03d46753bfc1c2ac4ca793788a4ed7fa
Diffstat (limited to 'packages/MtpDocumentsProvider')
| -rw-r--r-- | packages/MtpDocumentsProvider/Android.bp | 11 | ||||
| -rw-r--r-- | packages/MtpDocumentsProvider/Android.mk | 18 |
2 files changed, 11 insertions, 18 deletions
diff --git a/packages/MtpDocumentsProvider/Android.bp b/packages/MtpDocumentsProvider/Android.bp new file mode 100644 index 000000000000..3dafa2649af6 --- /dev/null +++ b/packages/MtpDocumentsProvider/Android.bp @@ -0,0 +1,11 @@ +android_app { + name: "MtpDocumentsProvider", + + srcs: ["src/**/*.java"], + platform_apis: true, + certificate: "media", + privileged: true, + optimize: { + proguard_flags_files: ["proguard.flags"], + }, +} diff --git a/packages/MtpDocumentsProvider/Android.mk b/packages/MtpDocumentsProvider/Android.mk deleted file mode 100644 index 2d62a07566bf..000000000000 --- a/packages/MtpDocumentsProvider/Android.mk +++ /dev/null @@ -1,18 +0,0 @@ -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := optional -LOCAL_SRC_FILES := $(call all-java-files-under, src) -LOCAL_PACKAGE_NAME := MtpDocumentsProvider -LOCAL_PRIVATE_PLATFORM_APIS := true -LOCAL_CERTIFICATE := media -LOCAL_PRIVILEGED_MODULE := true -LOCAL_PROGUARD_FLAG_FILES := proguard.flags - -# Only enable asserts on userdebug/eng builds -ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) -LOCAL_JACK_FLAGS += -D jack.assert.policy=always -endif - -include $(BUILD_PACKAGE) -include $(call all-makefiles-under, $(LOCAL_PATH)) |