diff options
author | Anton Hansson <hansson@google.com> | 2019-03-29 13:51:05 +0000 |
---|---|---|
committer | Anton Hansson <hansson@google.com> | 2019-03-29 13:51:05 +0000 |
commit | 8c3382d15431bf2f4e37b44077addfeb891a2870 (patch) | |
tree | 18ba3d640a1443c845d5287d88888fd913630a72 | |
parent | c40dd9b4e87de5e9ac14166dad94efbe9f9e2472 (diff) | |
download | android_packages_screensavers_PhotoTable-8c3382d15431bf2f4e37b44077addfeb891a2870.tar.gz android_packages_screensavers_PhotoTable-8c3382d15431bf2f4e37b44077addfeb891a2870.tar.bz2 android_packages_screensavers_PhotoTable-8c3382d15431bf2f4e37b44077addfeb891a2870.zip |
Move PhotoTable to /product
This app is frequently overriden by proprietary apps
on shipping devices, so move it to /product.
Bug: 122353713
Test: launch app on aosp_blueline
Change-Id: I4cb0415b3a283505f0550766d195238008d6c6f5
-rw-r--r-- | Android.bp | 1 | ||||
-rw-r--r-- | CleanSpec.mk | 51 |
2 files changed, 52 insertions, 0 deletions
@@ -2,5 +2,6 @@ android_app { name: "PhotoTable", // Only compile source java files in this apk. srcs: ["src/**/*.java"], + product_specific: true, sdk_version: "current", } diff --git a/CleanSpec.mk b/CleanSpec.mk new file mode 100644 index 0000000..06a4188 --- /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/PhotoTable) + +# ************************************************ +# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST +# ************************************************ |