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

Commit 72ad4a04 authored by Colin Cross's avatar Colin Cross
Browse files

Delete jack support 

Remove references to jack makefiles that no longer exist.

Bug: 65302138
Test: m -j checkbuild
Change-Id: I9fbee7db0167300edf59a85badeff87b4b25f846
Merged-In: I9fbee7db0167300edf59a85badeff87b4b25f846
(cherry picked from commit c6fbe4ef)
parent 0d506fc4

core/tests/hosttests/test-apps/MultiDexLegacyTestApp/Android.mk

+0 −24
Original line number Diff line number Diff line
@@ -33,29 +33,17 @@ mainDexList:= \ 
	$(call intermediates-dir-for,APPS,$(LOCAL_PACKAGE_NAME),$(LOCAL_IS_HOST_MODULE),common)/maindex.list



LOCAL_DX_FLAGS := --multi-dex --main-dex-list=$(mainDexList) --minimal-main-dex

LOCAL_JACK_FLAGS := -D jack.dex.output.policy=minimal-multidex -D jack.preprocessor=true\

    -D jack.preprocessor.file=$(LOCAL_PATH)/test.jpp -D jack.dex.output.multidex.legacy=true



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

include $(BUILD_SYSTEM)/configure_local_jack.mk

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



ifdef LOCAL_JACK_ENABLED

LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/test.jpp

endif



LOCAL_MIN_SDK_VERSION := 8



include $(BUILD_PACKAGE)



ifndef LOCAL_JACK_ENABLED

$(mainDexList): $(full_classes_proguard_jar) | $(MAINDEXCLASSES)

	$(hide) mkdir -p $(dir $@)

	$(MAINDEXCLASSES) $< 1>$@

	echo "com/android/multidexlegacytestapp/Test.class" >> $@



$(built_dex_intermediate): $(mainDexList)

endif



## The application with a full main dex

include $(CLEAR_VARS)
@@ -76,26 +64,14 @@ mainDexList2:= \ 
	$(call intermediates-dir-for,APPS,$(LOCAL_PACKAGE_NAME),$(LOCAL_IS_HOST_MODULE),common)/maindex.list



LOCAL_DX_FLAGS := --multi-dex --main-dex-list=$(mainDexList2)

LOCAL_JACK_FLAGS := -D jack.dex.output.policy=multidex -D jack.preprocessor=true\

    -D jack.preprocessor.file=$(LOCAL_PATH)/test.jpp -D jack.dex.output.multidex.legacy=true



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

include $(BUILD_SYSTEM)/configure_local_jack.mk

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



ifdef LOCAL_JACK_ENABLED

LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/test.jpp

endif



LOCAL_MIN_SDK_VERSION := 8



include $(BUILD_PACKAGE)



ifndef LOCAL_JACK_ENABLED

$(mainDexList2): $(full_classes_proguard_jar) | $(MAINDEXCLASSES)

	$(hide) mkdir -p $(dir $@)

	$(MAINDEXCLASSES) $< 1>$@

	echo "com/android/multidexlegacytestapp/Test.class" >> $@



$(built_dex_intermediate): $(mainDexList2)
 
endif
 
 No newline at end of file

core/tests/hosttests/test-apps/MultiDexLegacyTestApp/test.jpp

deleted100644 → 0
+0 −3
Original line number Diff line number Diff line 
test:

  @@com.android.jack.annotations.ForceInMainDex

  class com.android.multidexlegacytestapp.Test

core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/Android.mk

+0 −12
Original line number Diff line number Diff line
@@ -32,24 +32,12 @@ mainDexList:= \ 
	$(call intermediates-dir-for,APPS,$(LOCAL_PACKAGE_NAME),$(LOCAL_IS_HOST_MODULE),common)/maindex.list



LOCAL_DX_FLAGS := --multi-dex --main-dex-list=$(mainDexList) --minimal-main-dex

LOCAL_JACK_FLAGS := -D jack.dex.output.policy=minimal-multidex -D jack.preprocessor=true\

    -D jack.preprocessor.file=$(LOCAL_PATH)/test.jpp -D jack.dex.output.multidex.legacy=true



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

include $(BUILD_SYSTEM)/configure_local_jack.mk

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



ifdef LOCAL_JACK_ENABLED

LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/test.jpp

endif



include $(BUILD_PACKAGE)



ifndef LOCAL_JACK_ENABLED

$(mainDexList): $(full_classes_proguard_jar) | $(MAINDEXCLASSES)

	$(hide) mkdir -p $(dir $@)

	$(MAINDEXCLASSES) $< 1>$@

	echo "com/android/framework/multidexlegacyversionedtestapp/MultiDexUpdateTest.class" >> $@



$(built_dex_intermediate): $(mainDexList)
 
endif
 
 No newline at end of file

core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/test.jpp

deleted100644 → 0
+0 −3
Original line number Diff line number Diff line 
test:

  @@com.android.jack.annotations.ForceInMainDex

  class com.android.framework.multidexlegacyversionedtestapp.MultiDexUpdateTest

core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/Android.mk

+0 −12
Original line number Diff line number Diff line
@@ -32,24 +32,12 @@ mainDexList:= \ 
	$(call intermediates-dir-for,APPS,$(LOCAL_PACKAGE_NAME),$(LOCAL_IS_HOST_MODULE),common)/maindex.list



LOCAL_DX_FLAGS := --multi-dex --main-dex-list=$(mainDexList) --minimal-main-dex

LOCAL_JACK_FLAGS := -D jack.dex.output.policy=minimal-multidex -D jack.preprocessor=true\

    -D jack.preprocessor.file=$(LOCAL_PATH)/test.jpp -D jack.dex.output.multidex.legacy=true



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

include $(BUILD_SYSTEM)/configure_local_jack.mk

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



ifdef LOCAL_JACK_ENABLED

LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/test.jpp

endif



include $(BUILD_PACKAGE)



ifndef LOCAL_JACK_ENABLED

$(mainDexList): $(full_classes_proguard_jar) | $(MAINDEXCLASSES)

	$(hide) mkdir -p $(dir $@)

	$(MAINDEXCLASSES) $< 1>$@

	echo "com/android/framework/multidexlegacyversionedtestapp/MultiDexUpdateTest.class" >> $@



$(built_dex_intermediate): $(mainDexList)
 
endif