Merge "Use java_import to rename jars" into main (10fde511) · Commits · e / os / android_frameworks_base

CleanSpec.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -263,6 +263,7 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/InProcessTethering)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/OsuLogin)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system_other/system/app/OsuLogin)
		$(call add-clean-step, rm -rf $(OUT_DIR)/host/linux-x86/testcases/ravenwood-runtime)
		$(call add-clean-step, rm -rf $(OUT_DIR)/host/linux-x86/testcases/ravenwood-runtime)
		# ******************************************************************
		# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST ABOVE THIS BANNER
		# ******************************************************************

ravenwood/Android.bp

+35 −11

Original line number	Diff line number	Diff line
		@@ -641,34 +641,55 @@ filegroup {
		// JARs in "ravenwood-runtime" are set to the classpath, sorted alphabetically.
		// Rename some of the dependencies to make sure they're included in the intended order.

		java_library {
		java_import {
		name: "100-framework-minus-apex.ravenwood",
		installable: false,
		static_libs: ["framework-minus-apex.ravenwood"],
		jars: [":framework-minus-apex.ravenwood"],
		visibility: ["//visibility:private"],
		}

		java_library {
		java_import {
		name: "200-kxml2-android",
		installable: false,
		static_libs: ["kxml2-android"],
		jars: [":kxml2-android"],
		visibility: ["//visibility:private"],
		}

		java_library {
		java_import {
		name: "z00-50-framework-updatable-stubs-module_libs_api",
		installable: false,
		static_libs: ["framework-updatable-stubs-module_libs_api-for-host"],
		jars: [":framework-updatable-stubs-module_libs_api-for-host"],
		visibility: ["//visibility:private"],
		}

		java_library {
		java_import {
		name: "z00-all-updatable-modules-system-stubs",
		jars: [":all-updatable-modules-system-stubs-for-host"],
		visibility: ["//visibility:private"],
		}

		// We add empty jar files with specific names to overwrite stale jar files
		// that should be removed from ravenwood-runtime.
		// We need them until CleanSpec.mk gets fixed.
		//
		// TODO(b/418236847) Once CleanSpec.mk is fixed, delete the following
		// empty jars and instead delete the whole ravenwood-runtime/ directory,
		// using f/b/CleanSpec.mk.

		java_defaults {
		name: "ravenwood-empty-jar",
		installable: false,
		static_libs: ["all-updatable-modules-system-stubs-for-host"],
		sdk_version: "core_current",
		visibility: ["//visibility:private"],
		}

		java_library {
		name: "ravenwood-empty-framework-minus-apex.ravenwood",
		stem: "framework-minus-apex.ravenwood",
		}

		java_library {
		name: "ravenwood-empty-kxml2-android",
		stem: "kxml2-android",
		}

		android_ravenwood_libgroup {
		name: "ravenwood-runtime",
		data: [":ravenwood-data"],
		@@ -734,6 +755,9 @@ android_ravenwood_libgroup {
		// covered in framework-updatable-stubs-module_libs_api. Libcore
		// doesn't have MODULE_LIBRARIES APIs.)
		"z00-all-updatable-modules-system-stubs",

		"ravenwood-empty-framework-minus-apex.ravenwood",
		"ravenwood-empty-kxml2-android",
		],
		jni_libs: [
		// Libraries has to be loaded in the following order