summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Hansson <hansson@google.com>2019-04-03 02:18:25 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-04-03 02:18:25 -0700
commit0cdf2a521391105d39f331a8bbed047500fa8674 (patch)
tree692c5cd514bdfb7e9811581a541b9773d2e31bd8
parent4f52276095d179314578f5eb04209158c160ca23 (diff)
parentb939abc4b2b08c0bb85b1b3e9809c5bdc412209a (diff)
downloadandroid_packages_screensavers_PhotoTable-0cdf2a521391105d39f331a8bbed047500fa8674.tar.gz
android_packages_screensavers_PhotoTable-0cdf2a521391105d39f331a8bbed047500fa8674.tar.bz2
android_packages_screensavers_PhotoTable-0cdf2a521391105d39f331a8bbed047500fa8674.zip
Merge "Move PhotoTable to /product" am: 0664acb5d4
am: b939abc4b2 Change-Id: Ifeab04e051a0454c4c76b60147a09ceb02f41fb5
-rw-r--r--Android.bp1
-rw-r--r--CleanSpec.mk51
2 files changed, 52 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index 4d3de00..0097373 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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
+# ************************************************