diff options
author | Anton Hansson <hansson@google.com> | 2019-01-22 17:11:56 +0000 |
---|---|---|
committer | Anton Hansson <hansson@google.com> | 2019-01-22 17:57:07 +0000 |
commit | b4ac8ac0cfa6428268887c70170c176a580b43f5 (patch) | |
tree | 31410771c98825bc1577deab0e160b868ac078ad | |
parent | b3b53b20828f4028cd2b552f0347ce6f736db0ea (diff) | |
download | ModuleMetadata-b4ac8ac0cfa6428268887c70170c176a580b43f5.tar.gz |
Move ModuleMetadata to /productandroid-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1
This app is frequently overriden by proprietary apps
on shipping devices, so move it to /product.
Bug: 122353713
Test: make
Change-Id: I66a9861f3896c45a384465478004170ae3b9eccf
-rw-r--r-- | Android.bp | 3 | ||||
-rw-r--r-- | CleanSpec.mk | 51 |
2 files changed, 53 insertions, 1 deletions
@@ -18,6 +18,7 @@ android_app { name: "ModuleMetadata", sdk_version: "28", + product_specific: true, optimize: { enabled: false, }, @@ -25,4 +26,4 @@ android_app { dex_preopt: { enabled: false, }, -}
\ No newline at end of file +} diff --git a/CleanSpec.mk b/CleanSpec.mk new file mode 100644 index 0000000..88a1f03 --- /dev/null +++ b/CleanSpec.mk @@ -0,0 +1,51 @@ +# Copyright (C) 2019 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. +# + +# If you don't need to do a full clean build but would like to touch +# a file or delete some intermediate files, add a clean step to the end +# of the list. These steps will only be run once, if they haven't been +# run before. +# +# E.g.: +# $(call add-clean-step, touch -c external/sqlite/sqlite3.h) +# $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libz_intermediates) +# +# Always use "touch -c" and "rm -f" or "rm -rf" to gracefully deal with +# files that are missing or have been moved. +# +# Use $(PRODUCT_OUT) to get to the "out/target/product/blah/" directory. +# Use $(OUT_DIR) to refer to the "out" directory. +# +# If you need to re-do something that's already mentioned, just copy +# the command and add it to the bottom of the list. E.g., if a change +# that you made last week required touching a file and a change you +# made today requires touching the same file, just copy the old +# touch step and add it to the end of the list. +# +# ************************************************ +# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST +# ************************************************ + +# For example: +#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/AndroidTests_intermediates) +#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates) +#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f) +#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*) + +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/ModuleMetadata) + +# ************************************************ +# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST +# ************************************************ |