From 1dc77abf87d303a8f4aa35148c57f7ab20832222 Mon Sep 17 00:00:00 2001 From: Martin Stjernholm Date: Mon, 10 May 2021 17:44:05 +0100 Subject: Disable most ART source modules when ART prebuilts are enabled. After libdexfile_external was merged into libdexfile, libdexfile is an APEX stub when prebuilts are enabled, and that cannot be used to build libart and all the other internal modules that depend on it. This CL: - Changes art_defaults to disable native modules when building from prebuilts. Some other modules that depends on them, like the art-script sh_binary, also get disabled. - Consolidates the makefile sections that are disabled when building from prebuilts so that only a small bit is still enabled then. - Temporarily removes the prebuilt for libctstiagent and activates its source even when prebuilts are used, to work around sdk_version problem (b/187288515). - Removes explicit "enabled: true" in a couple of places that would override the inherited flag that lets us disable them in builds from prebuilts. - Makes some Soong defaults available to libcore. Test: m checkbuild Test: art/build/build-art-module.sh --skip-apex packages/modules/ArtPrebuilt/update-art-module-prebuilts.py \ --local-dist out/dist/ --skip-apex m SOONG_CONFIG_art_module_source_build=false droid m SOONG_CONFIG_art_module_source_build=false checkbuild Change-Id: Ief60b933cd6273fc8b85fe7637b99ba1b78505f6 --- dexdump/Android.bp | 1 - 1 file changed, 1 deletion(-) (limited to 'dexdump/Android.bp') diff --git a/dexdump/Android.bp b/dexdump/Android.bp index 87abfc1fbc..eb33b26651 100644 --- a/dexdump/Android.bp +++ b/dexdump/Android.bp @@ -46,7 +46,6 @@ art_cc_binary { // Use static libs on host: required for Windows build and // static_sdk_tools build. host: { - enabled: true, stl: "libc++_static", static_libs: [ "libdexfile", -- cgit v1.2.3-59-g8ed1b