tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove obsolete ide.mk and related code

Browse source 
The code to generate an eclipse classpath is obsolete, remove it and
related code.

Test: no change to out/build-aosp_cf_x86_64_phone.ninja
Change-Id: I7e1b6268b98ecbb7be88db8945dd7b30acc695ba
This commit is contained in:
Colin Cross 2023-11-02 10:13:27 -07:00
parent 34fe77a493
commit 1b7f072505
6 changed files with 1 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/clear_vars.mk
View file

@ -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:=

1
core/host_java_library_common.mk
View file

@ -46,5 +46,4 @@ else
endif
endif
LOCAL_INTERMEDIATE_SOURCE_DIR := $(intermediates.COMMON)/src
LOCAL_JAVA_LIBRARIES := $(sort $(LOCAL_JAVA_LIBRARIES))

2
core/java.mk
View file

@ -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
###########################################################

6
core/java_common.mk
View file

@ -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
###########################################################

1
core/ninja_config.mk
View file

@ -14,7 +14,6 @@ PARSE_TIME_MAKE_GOALS := \
$(PARSE_TIME_MAKE_GOALS) \
$(dont_bother_goals) \
all \
ECLIPSE-% \
brillo_tests \
btnod \
build-art% \

61
core/tasks/ide.mk
View file

@ -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 '<classpath>' > $@
$(hide) for p in $(PRIVATE_DIRS) ; do \
echo -n ' <classpathentry kind="src" path="' >> $@ ; \
( if [ -d $$p/src ] ; then echo -n $$p/src ; else echo -n $$p ; fi ) >> $@ ; \
echo '"/>' >> $@ ; \
done
$(hide) echo '</classpath>' >> $@
endif