Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b7f0725 authored by Colin Cross's avatar Colin Cross
Browse files

Remove obsolete ide.mk and related code 

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
parent 34fe77a4

core/clear_vars.mk

+0 −1
Original line number Diff line number Diff line
@@ -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:=

core/host_java_library_common.mk

+0 −1
Original line number Diff line number Diff line
@@ -46,5 +46,4 @@ else 
endif

endif



LOCAL_INTERMEDIATE_SOURCE_DIR := $(intermediates.COMMON)/src

LOCAL_JAVA_LIBRARIES := $(sort $(LOCAL_JAVA_LIBRARIES))

core/java.mk

+0 −2
Original line number Diff line number Diff line
@@ -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

###########################################################

core/java_common.mk

+1 −5
Original line number Diff line number Diff line
@@ -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

###########################################################

core/ninja_config.mk

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ PARSE_TIME_MAKE_GOALS := \ 
	$(PARSE_TIME_MAKE_GOALS) \

	$(dont_bother_goals) \

	all \

	ECLIPSE-% \

	brillo_tests \

	btnod \

	build-art% \