diff options
-rw-r--r-- | CleanSpec.mk | 52 | ||||
-rw-r--r-- | LibParameter.mk | 16 | ||||
-rw-r--r-- | LibPfwUtility.mk | 8 |
3 files changed, 52 insertions, 24 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk new file mode 100644 index 0000000..96ccc67 --- /dev/null +++ b/CleanSpec.mk @@ -0,0 +1,52 @@ +# Copyright (C) 2007 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 $(HOST_OUT_HEADERS)) +$(call add-clean-step, rm -rf $(TARGET_OUT_HEADERS)) + +# ************************************************ +# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST +# ************************************************ diff --git a/LibParameter.mk b/LibParameter.mk index fa7d26f..7d5f1e9 100644 --- a/LibParameter.mk +++ b/LibParameter.mk @@ -124,22 +124,6 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := \ $(LOCAL_PATH)/upstream/remote-processor/ \ $(LOCAL_PATH)/support/android/parameter/ -common_copy_headers_to := parameter -common_copy_headers := \ - upstream/parameter/include/ParameterMgrLoggerForward.h \ - upstream/parameter/include/ParameterMgrPlatformConnector.h \ - upstream/parameter/include/ParameterMgrFullConnector.h \ - upstream/parameter/include/SelectionCriterionTypeInterface.h \ - upstream/parameter/include/SelectionCriterionInterface.h \ - upstream/parameter/include/ParameterHandle.h \ - support/android/parameter/parameter_export.h \ - upstream/parameter/include/ElementHandle.h - -LOCAL_C_INCLUDES := $(LOCAL_EXPORT_C_INCLUDE_DIRS) - -LOCAL_COPY_HEADERS_TO := $(common_copy_headers_to) -LOCAL_COPY_HEADERS := $(common_copy_headers) - LOCAL_C_INCLUDES := $(LOCAL_EXPORT_C_INCLUDE_DIRS) LOCAL_SHARED_LIBRARIES := libremote-processor$(PFW_NETWORKING_SUFFIX)$(SUFFIX) diff --git a/LibPfwUtility.mk b/LibPfwUtility.mk index d2b3fbe..5f4cdbd 100644 --- a/LibPfwUtility.mk +++ b/LibPfwUtility.mk @@ -40,16 +40,8 @@ LOCAL_SRC_FILES := \ upstream/utility/Tokenizer.cpp \ upstream/utility/Utility.cpp -target_copy_headers := \ - upstream/utility/NonCopyable.hpp \ - upstream/utility/ErrorContext.hpp \ - upstream/utility/Utility.h \ - upstream/utility/convert.hpp - LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/upstream/utility/ LOCAL_C_INCLUDES := $(LOCAL_PATH)/upstream/utility/ LOCAL_CFLAGS := -frtti -fexceptions -LOCAL_COPY_HEADERS := $(target_copy_headers) - LOCAL_CLANG := true |