Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Delete jack support"

Browse Source
This commit is contained in:
Treehugger Robot
2017-10-03 01:17:25 +00:00
committed by Gerrit Code Review
parent 33a200e572 1c034700de
commit 1704df64ce
8 changed files with 0 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/tests/hosttests/test-apps/MultiDexLegacyTestApp/Android.mk
View File

@@ -33,29 +33,17 @@ mainDexList:= \
$(call intermediates-dir-for,APPS,$(LOCAL_PACKAGE_NAME),$(LOCAL_IS_HOST_MODULE),common)/maindex.list $(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_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 LOCAL_MIN_SDK_VERSION := 8
include $(BUILD_PACKAGE) include $(BUILD_PACKAGE)
ifndef LOCAL_JACK_ENABLED
$(mainDexList): $(full_classes_proguard_jar) | $(MAINDEXCLASSES) $(mainDexList): $(full_classes_proguard_jar) | $(MAINDEXCLASSES)
$(hide) mkdir -p $(dir $@) $(hide) mkdir -p $(dir $@)
$(MAINDEXCLASSES) $< 1>$@ $(MAINDEXCLASSES) $< 1>$@
echo "com/android/multidexlegacytestapp/Test.class" >> $@ echo "com/android/multidexlegacytestapp/Test.class" >> $@
$(built_dex_intermediate): $(mainDexList) $(built_dex_intermediate): $(mainDexList)
endif
## The application with a full main dex ## The application with a full main dex
include $(CLEAR_VARS) include $(CLEAR_VARS)
@@ -76,26 +64,14 @@ mainDexList2:= \
$(call intermediates-dir-for,APPS,$(LOCAL_PACKAGE_NAME),$(LOCAL_IS_HOST_MODULE),common)/maindex.list $(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_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 LOCAL_MIN_SDK_VERSION := 8
include $(BUILD_PACKAGE) include $(BUILD_PACKAGE)
ifndef LOCAL_JACK_ENABLED
$(mainDexList2): $(full_classes_proguard_jar) | $(MAINDEXCLASSES) $(mainDexList2): $(full_classes_proguard_jar) | $(MAINDEXCLASSES)
$(hide) mkdir -p $(dir $@) $(hide) mkdir -p $(dir $@)
$(MAINDEXCLASSES) $< 1>$@ $(MAINDEXCLASSES) $< 1>$@
echo "com/android/multidexlegacytestapp/Test.class" >> $@ echo "com/android/multidexlegacytestapp/Test.class" >> $@
$(built_dex_intermediate): $(mainDexList2) $(built_dex_intermediate): $(mainDexList2)
endif

3
core/tests/hosttests/test-apps/MultiDexLegacyTestApp/test.jpp
View File

@@ -1,3 +0,0 @@
test:
@@com.android.jack.annotations.ForceInMainDex
class com.android.multidexlegacytestapp.Test

12
core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/Android.mk
View File

@@ -32,24 +32,12 @@ mainDexList:= \
$(call intermediates-dir-for,APPS,$(LOCAL_PACKAGE_NAME),$(LOCAL_IS_HOST_MODULE),common)/maindex.list $(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_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) include $(BUILD_PACKAGE)
ifndef LOCAL_JACK_ENABLED
$(mainDexList): $(full_classes_proguard_jar) | $(MAINDEXCLASSES) $(mainDexList): $(full_classes_proguard_jar) | $(MAINDEXCLASSES)
$(hide) mkdir -p $(dir $@) $(hide) mkdir -p $(dir $@)
$(MAINDEXCLASSES) $< 1>$@ $(MAINDEXCLASSES) $< 1>$@
echo "com/android/framework/multidexlegacyversionedtestapp/MultiDexUpdateTest.class" >> $@ echo "com/android/framework/multidexlegacyversionedtestapp/MultiDexUpdateTest.class" >> $@
$(built_dex_intermediate): $(mainDexList) $(built_dex_intermediate): $(mainDexList)
endif

3
core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/test.jpp
View File

@@ -1,3 +0,0 @@
test:
@@com.android.jack.annotations.ForceInMainDex
class com.android.framework.multidexlegacyversionedtestapp.MultiDexUpdateTest

12
core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/Android.mk
View File

@@ -32,24 +32,12 @@ mainDexList:= \
$(call intermediates-dir-for,APPS,$(LOCAL_PACKAGE_NAME),$(LOCAL_IS_HOST_MODULE),common)/maindex.list $(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_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) include $(BUILD_PACKAGE)
ifndef LOCAL_JACK_ENABLED
$(mainDexList): $(full_classes_proguard_jar) | $(MAINDEXCLASSES) $(mainDexList): $(full_classes_proguard_jar) | $(MAINDEXCLASSES)
$(hide) mkdir -p $(dir $@) $(hide) mkdir -p $(dir $@)
$(MAINDEXCLASSES) $< 1>$@ $(MAINDEXCLASSES) $< 1>$@
echo "com/android/framework/multidexlegacyversionedtestapp/MultiDexUpdateTest.class" >> $@ echo "com/android/framework/multidexlegacyversionedtestapp/MultiDexUpdateTest.class" >> $@
$(built_dex_intermediate): $(mainDexList) $(built_dex_intermediate): $(mainDexList)
endif

3
core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/test.jpp
View File

@@ -1,3 +0,0 @@
test:
@@com.android.jack.annotations.ForceInMainDex
class com.android.framework.multidexlegacyversionedtestapp.MultiDexUpdateTest

12
core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v3/Android.mk
View File

@@ -32,25 +32,13 @@ mainDexList:= \
LOCAL_DEX_PREOPT := false LOCAL_DEX_PREOPT := false
LOCAL_DX_FLAGS := --multi-dex --main-dex-list=$(mainDexList) --minimal-main-dex 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) include $(BUILD_PACKAGE)
ifndef LOCAL_JACK_ENABLED
$(mainDexList): $(full_classes_proguard_jar) | $(MAINDEXCLASSES) $(mainDexList): $(full_classes_proguard_jar) | $(MAINDEXCLASSES)
$(hide) mkdir -p $(dir $@) $(hide) mkdir -p $(dir $@)
$(MAINDEXCLASSES) $< 1>$@ $(MAINDEXCLASSES) $< 1>$@
echo "com/android/framework/multidexlegacyversionedtestapp/MultiDexUpdateTest.class" >> $@ echo "com/android/framework/multidexlegacyversionedtestapp/MultiDexUpdateTest.class" >> $@
$(built_dex_intermediate): $(mainDexList) $(built_dex_intermediate): $(mainDexList)
endif

3
core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v3/test.jpp
View File

@@ -1,3 +0,0 @@
test:
@@com.android.jack.annotations.ForceInMainDex
class com.android.framework.multidexlegacyversionedtestapp.MultiDexUpdateTest