Revert "ART: Hook Runtime APEX checker into build"
This reverts commit d9e2216b97da3da553b07f431ac4f2dd1f727e21.
Reason for revert: Internal builds with flattened APEXes
Bug: 123780484
Change-Id: I93746f7ba5d6016621a6ffcd27aa7bee4b175cc2
Test: N/A
diff --git a/Android.mk b/Android.mk
index 1a7ed43..526cd59 100644
--- a/Android.mk
+++ b/Android.mk
@@ -352,18 +352,13 @@
# Module with both release and debug variants, as well as
# additional tools.
TARGET_RUNTIME_APEX := com.android.runtime.debug
- APEX_TEST_MODULE := art-check-debug-apex-gen-fakebin
else
# Release module (without debug variants nor tools).
TARGET_RUNTIME_APEX := com.android.runtime.release
- APEX_TEST_MODULE := art-check-release-apex-gen-fakebin
endif
LOCAL_MODULE := com.android.runtime
LOCAL_REQUIRED_MODULES := $(TARGET_RUNTIME_APEX)
-ifneq ($(HOST_OS),darwin)
- LOCAL_REQUIRED_MODULES += $(APEX_TEST_MODULE)
-endif
# Clear locally used variable.
art_target_include_debug_build :=
diff --git a/build/apex/Android.bp b/build/apex/Android.bp
index 7e82944..47a1e4b 100644
--- a/build/apex/Android.bp
+++ b/build/apex/Android.bp
@@ -231,72 +231,3 @@
},
},
}
-
-python_binary_host {
- name: "art-apex-tester",
- srcs: ["art_apex_test.py"],
- main: "art_apex_test.py",
- version: {
- py2: {
- enabled: false,
- },
- py3: {
- enabled: true,
- },
- },
-}
-
-// Genrules so we can run the checker, and empty Java library so that it gets executed.
-
-genrule {
- name: "art-check-release-apex-gen",
- srcs: [":com.android.runtime.release"],
- tools: [
- "art-apex-tester",
- "debugfs",
- ],
- cmd: "$(location art-apex-tester)"
- + " --debugfs $(location debugfs)"
- + " --tmpdir $(genDir)"
- + " $(in)"
- + " && touch $(out)",
- out: ["art-check-release-apex-gen.dummy"],
-}
-cc_prebuilt_binary {
- name: "art-check-release-apex-gen-fakebin",
- srcs: [":art-check-release-apex-gen"],
- host_supported: true,
- device_supported: false,
- target: {
- darwin: {
- enabled: false, // No python3.
- },
- },
-}
-
-genrule {
- name: "art-check-debug-apex-gen",
- srcs: [":com.android.runtime.debug"],
- tools: [
- "art-apex-tester",
- "debugfs",
- ],
- cmd: "$(location art-apex-tester)"
- + " --debugfs $(location debugfs)"
- + " --tmpdir $(genDir)"
- + " --debug"
- + " $(in)"
- + " && touch $(out)",
- out: ["art-check-debug-apex-gen.dummy"],
-}
-cc_prebuilt_binary {
- name: "art-check-debug-apex-gen-fakebin",
- srcs: [":art-check-debug-apex-gen"],
- host_supported: true,
- device_supported: false,
- target: {
- darwin: {
- enabled: false, // No python3.
- },
- },
-}
