diff --git a/core/clear_vars.mk b/core/clear_vars.mk index d76c4f2a7d..0be21c5507 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk @@ -129,7 +129,6 @@ LOCAL_INJECT_BSSL_HASH:= LOCAL_INSTALLED_MODULE:= LOCAL_INSTALLED_MODULE_STEM:= LOCAL_INSTRUMENTATION_FOR:= -LOCAL_INTERMEDIATE_SOURCE_DIR:= LOCAL_INTERMEDIATE_SOURCES:= LOCAL_INTERMEDIATE_TARGETS:= LOCAL_IS_FUZZ_TARGET:= diff --git a/core/host_java_library_common.mk b/core/host_java_library_common.mk index 0e62f60d24..006e6ecfae 100644 --- a/core/host_java_library_common.mk +++ b/core/host_java_library_common.mk @@ -46,5 +46,4 @@ else endif endif -LOCAL_INTERMEDIATE_SOURCE_DIR := $(intermediates.COMMON)/src LOCAL_JAVA_LIBRARIES := $(sort $(LOCAL_JAVA_LIBRARIES)) diff --git a/core/java.mk b/core/java.mk index 842fcbf3f4..5fbc916859 100644 --- a/core/java.mk +++ b/core/java.mk @@ -83,8 +83,6 @@ LOCAL_INTERMEDIATE_TARGETS += \ $(full_classes_stubs_jar) \ $(java_source_list_file) -LOCAL_INTERMEDIATE_SOURCE_DIR := $(intermediates.COMMON)/src - ########################################################### ## AIDL: Compile .aidl files to .java ########################################################### diff --git a/core/java_common.mk b/core/java_common.mk index 0ae0346cf4..7b27056927 100644 --- a/core/java_common.mk +++ b/core/java_common.mk @@ -194,7 +194,7 @@ endif ###################################### ## PRIVATE java vars # LOCAL_SOURCE_FILES_ALL_GENERATED is set only if the module does not have static source files, -# but generated source files in its LOCAL_INTERMEDIATE_SOURCE_DIR. +# but generated source files. # You have to set up the dependency in some other way. need_compile_java := $(strip $(all_java_sources)$(LOCAL_SRCJARS)$(all_res_assets)$(java_resource_sources))$(LOCAL_STATIC_JAVA_LIBRARIES)$(filter true,$(LOCAL_SOURCE_FILES_ALL_GENERATED)) ifdef need_compile_java @@ -492,10 +492,6 @@ $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_ALL_JAVA_LIBRARIES := $(full_java_libs) $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_ALL_JAVA_HEADER_LIBRARIES := $(full_java_header_libs) $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_SHARED_JAVA_HEADER_LIBRARIES := $(full_shared_java_header_libs) -ALL_MODULES.$(my_register_name).INTERMEDIATE_SOURCE_DIR := \ - $(ALL_MODULES.$(my_register_name).INTERMEDIATE_SOURCE_DIR) $(LOCAL_INTERMEDIATE_SOURCE_DIR) - - ########################################################### # Verify that all libraries are safe to use ########################################################### diff --git a/core/ninja_config.mk b/core/ninja_config.mk index 2b5ceee796..d4b7c6df11 100644 --- a/core/ninja_config.mk +++ b/core/ninja_config.mk @@ -14,7 +14,6 @@ PARSE_TIME_MAKE_GOALS := \ $(PARSE_TIME_MAKE_GOALS) \ $(dont_bother_goals) \ all \ - ECLIPSE-% \ brillo_tests \ btnod \ build-art% \ diff --git a/core/tasks/ide.mk b/core/tasks/ide.mk deleted file mode 100644 index a3aa0cdc03..0000000000 --- a/core/tasks/ide.mk +++ /dev/null @@ -1,61 +0,0 @@ -# -# Copyright (C) 2010 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. -# - -define filter-ide-goals -$(strip $(filter $(1)-%,$(MAKECMDGOALS))) -endef - -define filter-ide-modules -$(strip $(subst -,$(space),$(patsubst $(1)-%,%,$(2)))) -endef - -# eclipse -eclipse_project_goals := $(call filter-ide-goals,ECLIPSE) -ifdef eclipse_project_goals - ifneq ($(words $(eclipse_project_goals)),1) - $(error Only one ECLIPSE- goal may be specified: $(eclipse_project_goals)) - endif - eclipse_project_modules := $(call filter-ide-modules,ECLIPSE,$(eclipse_project_goals)) - - ifneq ($(filter lunch,$(eclipse_project_modules)),) - eclipse_project_modules := $(filter-out lunch,$(eclipse_project_modules)) - installed_modules := $(foreach m,$(ALL_DEFAULT_INSTALLED_MODULES),\ - $(INSTALLABLE_FILES.$(m).MODULE)) - java_modules := $(foreach m,$(installed_modules),\ - $(if $(filter JAVA_LIBRARIES APPS,$(ALL_MODULES.$(m).CLASS)),$(m),)) - eclipse_project_modules := $(sort $(eclipse_project_modules) $(java_modules)) - endif - - source_paths := $(foreach m,$(eclipse_project_modules),$(ALL_MODULES.$(m).PATH)) \ - $(foreach m,$(eclipse_project_modules),$(ALL_MODULES.$(m).INTERMEDIATE_SOURCE_DIR)) - source_paths := $(sort $(source_paths)) - -.classpath: PRIVATE_MODULES := $(eclipse_project_modules) -.classpath: PRIVATE_DIRS := $(source_paths) - -# the mess below with ./src tries to guess whether the src -$(eclipse_project_goals): .classpath -.classpath: FORCE - $(hide) echo Generating .classpath for eclipse - $(hide) echo '' > $@ - $(hide) for p in $(PRIVATE_DIRS) ; do \ - echo -n ' ' >> $@ ; \ - done - $(hide) echo '' >> $@ -endif -