Remove generated java source post clean logic
Just move the proto and renderscript sources into their own directories
-- the entire directory is wiped if the file list changes since the
command line will change. So we can just enable/disable pulling sources
from those directories based on whether there were files in the list or
not.
Bug: 30947985
Test: m -j java
Test: Remove a proto file from a java lib, ensure the generated source
is not included.
Change-Id: If7529979de6fa62a651933a3a974f47b033851d6
This commit is contained in:
Dan Willemsen
parent
0c29ffb74d
commit
cf324af6b8
6 changed files with 31 additions and 67 deletions
|
|
@ -383,6 +383,13 @@ $(call add-clean-step, rm -rf $(TARGET_OUT_COMMON_INTERMEDIATES)/APPS/current_pa
|
|||
|
||||
$(call add-clean-step, rm -rf $(HOST_OUT_INTERMEDIATES)/include)
|
||||
|
||||
$(call add-clean-step, rm -rf $(HOST_OUT_COMMON_INTERMEDIATES)/APPS/*_intermediates/src)
|
||||
$(call add-clean-step, rm -rf $(HOST_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/*_intermediates/src)
|
||||
$(call add-clean-step, rm -rf $(TARGET_OUT_COMMON_INTERMEDIATES)/APPS/*_intermediates/src)
|
||||
$(call add-clean-step, rm -rf $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/*_intermediates/src)
|
||||
$(call add-clean-step, rm -rf $(TARGET_OUT_COMMON_INTERMEDIATES)/previous_gen_java_config.mk)
|
||||
$(call add-clean-step, rm -rf $(TARGET_OUT_COMMON_INTERMEDIATES)/current_gen_java_config.mk)
|
||||
|
||||
# ************************************************
|
||||
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
|
||||
# ************************************************
|
||||
|
|
|
|||
|
|
@ -2201,6 +2201,10 @@ $(call dump-words-to-file,$(PRIVATE_JAVA_SOURCES),$(PRIVATE_CLASS_INTERMEDIATES_
|
|||
$(hide) if [ -d "$(PRIVATE_SOURCE_INTERMEDIATES_DIR)" ]; then \
|
||||
find $(PRIVATE_SOURCE_INTERMEDIATES_DIR) -name '*.java' -and -not -name '.*' >> $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list; \
|
||||
fi
|
||||
$(if $(PRIVATE_HAS_PROTO_SOURCES), \
|
||||
$(hide) find $(PRIVATE_PROTO_SOURCE_INTERMEDIATES_DIR) -name '*.java' -and -not -name '.*' >> $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list )
|
||||
$(if $(PRIVATE_HAS_RS_SOURCES), \
|
||||
$(hide) find $(PRIVATE_RS_SOURCE_INTERMEDIATES_DIR) -name '*.java' -and -not -name '.*' >> $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list )
|
||||
$(hide) tr ' ' '\n' < $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list \
|
||||
| $(NORMALIZE_PATH) | sort -u > $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq
|
||||
$(hide) if [ -s $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq ] ; then \
|
||||
|
|
@ -2263,6 +2267,10 @@ $(call dump-words-to-file,$(PRIVATE_JAVA_SOURCES),$(PRIVATE_JACK_INTERMEDIATES_D
|
|||
$(hide) if [ -d "$(PRIVATE_SOURCE_INTERMEDIATES_DIR)" ]; then \
|
||||
find $(PRIVATE_SOURCE_INTERMEDIATES_DIR) -name '*.java' >> $(PRIVATE_JACK_INTERMEDIATES_DIR)/java-source-list; \
|
||||
fi
|
||||
$(if $(PRIVATE_HAS_PROTO_SOURCES), \
|
||||
$(hide) find $(PRIVATE_PROTO_SOURCE_INTERMEDIATES_DIR) -name '*.java' >> $(PRIVATE_JACK_INTERMEDIATES_DIR)/java-source-list )
|
||||
$(if $(PRIVATE_HAS_RS_SOURCES), \
|
||||
$(hide) find $(PRIVATE_RS_SOURCE_INTERMEDIATES_DIR) -name '*.java' >> $(PRIVATE_JACK_INTERMEDIATES_DIR)/java-source-list )
|
||||
$(hide) tr ' ' '\n' < $(PRIVATE_JACK_INTERMEDIATES_DIR)/java-source-list \
|
||||
| $(NORMALIZE_PATH) | sort -u > $(PRIVATE_JACK_INTERMEDIATES_DIR)/java-source-list-uniq
|
||||
$(if $(PRIVATE_JACK_PROGUARD_FLAGS), \
|
||||
|
|
@ -2329,6 +2337,10 @@ $(call dump-words-to-file,$(PRIVATE_JAVA_SOURCES),$@.java-source-list)
|
|||
$(hide) if [ -d "$(PRIVATE_SOURCE_INTERMEDIATES_DIR)" ]; then \
|
||||
find $(PRIVATE_SOURCE_INTERMEDIATES_DIR) -name '*.java' >> $@.java-source-list; \
|
||||
fi
|
||||
$(if $(PRIVATE_HAS_PROTO_SOURCES), \
|
||||
$(hide) find $(PRIVATE_PROTO_SOURCE_INTERMEDIATES_DIR) -name '*.java' >> $@.java-source-list )
|
||||
$(if $(PRIVATE_HAS_RS_SOURCES), \
|
||||
$(hide) find $(PRIVATE_RS_SOURCE_INTERMEDIATES_DIR) -name '*.java' >> $@.java-source-list )
|
||||
$(hide) tr ' ' '\n' < $@.java-source-list \
|
||||
| sort -u > $@.java-source-list-uniq
|
||||
$(hide) if [ -s $@.java-source-list-uniq ] ; then \
|
||||
|
|
@ -2438,6 +2450,10 @@ $(call dump-words-to-file,$(PRIVATE_JAVA_SOURCES),$(PRIVATE_JACK_INTERMEDIATES_D
|
|||
$(hide) if [ -d "$(PRIVATE_SOURCE_INTERMEDIATES_DIR)" ]; then \
|
||||
find $(PRIVATE_SOURCE_INTERMEDIATES_DIR) -name '*.java' >> $(PRIVATE_JACK_INTERMEDIATES_DIR)/java-source-list; \
|
||||
fi
|
||||
$(if $(PRIVATE_HAS_PROTO_SOURCES), \
|
||||
$(hide) find $(PRIVATE_PROTO_SOURCE_INTERMEDIATES_DIR) -name '*.java' >> $(PRIVATE_JACK_INTERMEDIATES_DIR)/java-source-list )
|
||||
$(if $(PRIVATE_HAS_RS_SOURCES), \
|
||||
$(hide) find $(PRIVATE_RS_SOURCE_INTERMEDIATES_DIR) -name '*.java' >> $(PRIVATE_JACK_INTERMEDIATES_DIR)/java-source-list )
|
||||
$(hide) tr ' ' '\n' < $(PRIVATE_JACK_INTERMEDIATES_DIR)/java-source-list \
|
||||
| $(NORMALIZE_PATH) | sort -u > $(PRIVATE_JACK_INTERMEDIATES_DIR)/java-source-list-uniq
|
||||
$(if $(PRIVATE_JACK_PROGUARD_FLAGS), \
|
||||
|
|
|
|||
|
|
@ -148,7 +148,7 @@ rs_compatibility_jni_libs :=
|
|||
ifneq ($(renderscript_sources),)
|
||||
renderscript_sources_fullpath := $(addprefix $(LOCAL_PATH)/, $(renderscript_sources))
|
||||
RenderScript_file_stamp := $(LOCAL_INTERMEDIATE_SOURCE_DIR)/RenderScript.stamp
|
||||
renderscript_intermediate.COMMON := $(LOCAL_INTERMEDIATE_SOURCE_DIR)/renderscript
|
||||
renderscript_intermediate.COMMON := $(intermediates.COMMON)/renderscript
|
||||
|
||||
# Defaulting to an empty string uses the latest available platform SDK.
|
||||
renderscript_target_api :=
|
||||
|
|
@ -353,6 +353,9 @@ all_java_sources := $(java_sources) $(addprefix $(TARGET_OUT_COMMON_INTERMEDIATE
|
|||
|
||||
include $(BUILD_SYSTEM)/java_common.mk
|
||||
|
||||
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_HAS_RS_SOURCES := $(if $(renderscript_sources),true)
|
||||
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_RS_SOURCE_INTERMEDIATES_DIR := $(intermediates.COMMON)/renderscript
|
||||
|
||||
#######################################
|
||||
# defines built_odex along with rule to install odex
|
||||
include $(BUILD_SYSTEM)/dex_preopt_odex_install.mk
|
||||
|
|
|
|||
|
|
@ -39,9 +39,7 @@ proto_java_sources_file_stamp :=
|
|||
ifneq ($(proto_sources),)
|
||||
proto_sources_fullpath := $(addprefix $(LOCAL_PATH)/, $(proto_sources))
|
||||
|
||||
# By putting the generated java files into $(LOCAL_INTERMEDIATE_SOURCE_DIR), they will be
|
||||
# automatically found by the java compiling function transform-java-to-classes.jar.
|
||||
proto_java_intemediate_dir := $(LOCAL_INTERMEDIATE_SOURCE_DIR)/proto
|
||||
proto_java_intemediate_dir := $(intermediates.COMMON)/proto
|
||||
proto_java_sources_file_stamp := $(proto_java_intemediate_dir)/Proto.stamp
|
||||
proto_java_sources_dir := $(proto_java_intemediate_dir)/src
|
||||
|
||||
|
|
@ -162,6 +160,9 @@ $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_ASSET_DIR := $(LOCAL_ASSET_DIR)
|
|||
|
||||
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_CLASS_INTERMEDIATES_DIR := $(intermediates.COMMON)/classes
|
||||
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_SOURCE_INTERMEDIATES_DIR := $(intermediates.COMMON)/src
|
||||
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_HAS_PROTO_SOURCES := $(if $(proto_sources),true)
|
||||
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_PROTO_SOURCE_INTERMEDIATES_DIR := $(intermediates.COMMON)/proto
|
||||
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_HAS_RS_SOURCES :=
|
||||
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JAVA_SOURCES := $(all_java_sources)
|
||||
|
||||
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_RMTYPEDEFS := $(LOCAL_RMTYPEDEFS)
|
||||
|
|
|
|||
|
|
@ -510,9 +510,6 @@ endif # dont_bother
|
|||
|
||||
endif # ONE_SHOT_MAKEFILE
|
||||
|
||||
# Now with all Android.mks loaded we can do post cleaning steps.
|
||||
include $(BUILD_SYSTEM)/post_clean.mk
|
||||
|
||||
# -------------------------------------------------------------------
|
||||
# All module makefiles have been included at this point.
|
||||
# -------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -1,60 +0,0 @@
|
|||
# Copyright (C) 2012 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.
|
||||
|
||||
# Clean steps that need global knowledge of individual modules.
|
||||
# This file must be included after all Android.mks have been loaded.
|
||||
|
||||
#######################################################
|
||||
# Check if we need to delete obsolete generated java files.
|
||||
# When an proto/etc file gets deleted (or renamed), the generated java file is obsolete.
|
||||
previous_gen_java_config := $(TARGET_OUT_COMMON_INTERMEDIATES)/previous_gen_java_config.mk
|
||||
current_gen_java_config := $(TARGET_OUT_COMMON_INTERMEDIATES)/current_gen_java_config.mk
|
||||
|
||||
$(shell rm -rf $(current_gen_java_config) \
|
||||
&& mkdir -p $(dir $(current_gen_java_config))\
|
||||
&& touch $(current_gen_java_config))
|
||||
-include $(previous_gen_java_config)
|
||||
|
||||
intermediates_to_clean :=
|
||||
modules_with_gen_java_files :=
|
||||
$(foreach p, $(ALL_MODULES), \
|
||||
$(eval gs := $(strip $(ALL_MODULES.$(p).PROTO_FILES)\
|
||||
$(ALL_MODULES.$(p).RS_FILES)))\
|
||||
$(if $(gs),\
|
||||
$(eval modules_with_gen_java_files += $(p))\
|
||||
$(shell echo 'GEN_SRC_FILES.$(p) := $(gs)' >> $(current_gen_java_config)))\
|
||||
$(if $(filter-out $(gs),$(GEN_SRC_FILES.$(p))),\
|
||||
$(eval intermediates_to_clean += $(ALL_MODULES.$(p).INTERMEDIATE_SOURCE_DIR))))
|
||||
intermediates_to_clean := $(strip $(intermediates_to_clean))
|
||||
ifdef intermediates_to_clean
|
||||
$(info *** Obsolete generated java files detected, clean intermediate files...)
|
||||
$(info *** rm -rf $(intermediates_to_clean))
|
||||
$(shell rm -rf $(intermediates_to_clean))
|
||||
intermediates_to_clean :=
|
||||
endif
|
||||
|
||||
# For modules not loaded by the current build (e.g. you are running mm/mmm),
|
||||
# we copy the info from the previous bulid.
|
||||
$(foreach p, $(filter-out $(ALL_MODULES),$(MODULES_WITH_GEN_JAVA_FILES)),\
|
||||
$(shell echo 'GEN_SRC_FILES.$(p) := $(GEN_SRC_FILES.$(p))' >> $(current_gen_java_config)))
|
||||
MODULES_WITH_GEN_JAVA_FILES := $(sort $(MODULES_WITH_GEN_JAVA_FILES) $(modules_with_gen_java_files))
|
||||
$(shell echo 'MODULES_WITH_GEN_JAVA_FILES := $(MODULES_WITH_GEN_JAVA_FILES)' >> $(current_gen_java_config))
|
||||
|
||||
# Now current becomes previous.
|
||||
$(shell cmp $(current_gen_java_config) $(previous_gen_java_config) > /dev/null 2>&1 || mv -f $(current_gen_java_config) $(previous_gen_java_config))
|
||||
|
||||
MODULES_WITH_GEN_JAVA_FILES :=
|
||||
modules_with_gen_java_files :=
|
||||
previous_gen_java_config :=
|
||||
current_gen_java_config :=
|
||||
Loading…
Reference in a new issue