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

Commit 2748c616 authored by Sasha Smundak's avatar Sasha Smundak
Browse files

Remove unused (and currently broken) `samplecode` target. 

Running 'm samplecode' fails with
"build/make/core/main.mk:1834: error: overriding commands for target
`out/target/common/samples/libsimplejni.so', previously defined at
build/make/core/main.mk:1834"
This proves that noone has been using 'samplecode' target at least since
the build started generating both 32- and 64-bit shared libraries by default,
because development/samples/SimpleJNI/jni/Android.mk defines libsimplejni.so
as 'sample', and the deleted code in core/main.mk causes duplicate rule in
such case.

Test: treehugger
Change-Id: I38a4c478fcb0e60793129fe2513a8cdc6d2c79fb
parent 0c45b0d9

core/main.mk

+0 −16
Original line number Diff line number Diff line
@@ -1825,22 +1825,6 @@ tests : host-tests target-tests 
# Phony target to run all java compilations that use javac

.PHONY: javac-check



ifneq (,$(filter samplecode, $(MAKECMDGOALS)))

.PHONY: samplecode

sample_MODULES := $(sort $(call get-tagged-modules,samples))

sample_APKS_DEST_PATH := $(TARGET_COMMON_OUT_ROOT)/samples

sample_APKS_COLLECTION := \

        $(foreach module,$(sample_MODULES),$(sample_APKS_DEST_PATH)/$(notdir $(module)))

$(foreach module,$(sample_MODULES),$(eval $(call \

        copy-one-file,$(module),$(sample_APKS_DEST_PATH)/$(notdir $(module)))))

sample_ADDITIONAL_INSTALLED := \

        $(filter-out $(modules_to_install) $(modules_to_check),$(sample_MODULES))

samplecode: $(sample_APKS_COLLECTION)

	@echo "Collect sample code apks: $^"

	# remove apks that are not intended to be installed.

	rm -f $(sample_ADDITIONAL_INSTALLED)

endif  # samplecode in $(MAKECMDGOALS)



.PHONY: findbugs

findbugs: $(INTERNAL_FINDBUGS_HTML_TARGET) $(INTERNAL_FINDBUGS_XML_TARGET)