diff options
author | markchien <markchien@google.com> | 2019-12-20 21:58:00 +0800 |
---|---|---|
committer | markchien <markchien@google.com> | 2019-12-20 21:58:00 +0800 |
commit | 777bbd7f98462d3e58180bab11413cb3aa53fb9f (patch) | |
tree | 134a44f2a17637f8d2616ea917c9f734fe388b13 | |
parent | dae6c017590b3eed3c767ad325750485a8d2f4cd (diff) |
Fix clean InProcessTethering fail problem
CleanSpec only respect root of a git project.
Remove packages/Tethering/CldanSpec.mk because it never
be read.
Bug: 144320246
Test: manual build InProcessTethering and observed it is removed
after adding new clean step.
Change-Id: I58750e4a1fe11018d83da1ebf828d1b3134ec765
-rw-r--r-- | CleanSpec.mk | 1 | ||||
-rw-r--r-- | packages/Tethering/CleanSpec.mk | 58 |
2 files changed, 1 insertions, 58 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index b84e71526a14..0b7ea2832afa 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -259,6 +259,7 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/*-service.jar) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/service-statsd.jar) $(call add-clean-step, rm -rf $(SOONG_OUT_DIR)/.intermediates/frameworks/base/libincremental_aidl-cpp-source/) $(call add-clean-step, rm -rf $(SOONG_OUT_DIR)/.intermediates/frameworks/base/libincremental_manager_aidl-cpp-source/) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/InProcessTethering) # ****************************************************************** # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST ABOVE THIS BANNER # ****************************************************************** diff --git a/packages/Tethering/CleanSpec.mk b/packages/Tethering/CleanSpec.mk deleted file mode 100644 index 30bdd581d0af..000000000000 --- a/packages/Tethering/CleanSpec.mk +++ /dev/null @@ -1,58 +0,0 @@ -# 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 ABOVE THE BANNER -# ***************************************************************** - -# 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/priv-app/Tethering) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/InProcessTethering) -$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/InProcessTethering*) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/InProcessTethering*) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system_other/system/priv-app/InProcessTethering) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/apex/com.android.tethering) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/apex/com.android.tethering.apex) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/ETC/com.android.tethering*) - -# ****************************************************************** -# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST ABOVE THIS BANNER -# ****************************************************************** |