Merge "Bp2build support for sdk_version and java_version." (a3c029e7) · Commits · e / os / android_build_soong

android/allowlists/allowlists.go

+15 −6

Original line number	Diff line number	Diff line
		@@ -408,8 +408,6 @@ var (
		// this BUILD file is globbed by //external/icu/icu4c/source:icu4c_test_data's "data/*/".
		"external/icu/icu4c/source/data/unidata/norm2":/* recursive = */ false,

		"frameworks/ex/common":/* recursive = */ true,

		// Building manually due to b/179889880: resource files cross package boundary
		"packages/apps/Music":/* recursive = */ true,

		@@ -690,7 +688,6 @@ var (
		"libcodec2_soft_common",

		// kotlin srcs in java libs
		"CtsPkgInstallerConstants",
		"kotlinx_atomicfu",

		// kotlin srcs in java binary
		@@ -703,6 +700,9 @@ var (
		//kotlin srcs in android_binary
		"MusicKotlin",

		// java_library with prebuilt sdk_version
		"android-common",

		// checked in current.txt for merged_txts
		"non-updatable-current.txt",
		"non-updatable-system-current.txt",
		@@ -725,7 +725,6 @@ var (

		// min_sdk_version in android_app
		"CtsShimUpgrade",
		"fake-framework",
		}

		Bp2buildModuleTypeAlwaysConvertList = []string{
		@@ -780,6 +779,7 @@ var (

		// java bugs
		"libbase_ndk", // TODO(b/186826477): fails to link libctscamera2_jni for device (required for CtsCameraTestCases)
		"bouncycastle", // TODO(b/274474005): Need support for custom system_modules.

		// python protos
		"libprotobuf-python", // Has a handcrafted alternative
		@@ -846,7 +846,6 @@ var (
		"libgmock_ndk", // depends on unconverted modules: libgtest_ndk_c++
		"libnativehelper_lazy_mts_jni", "libnativehelper_mts_jni", // depends on unconverted modules: libnativetesthelper_jni, libgmock_ndk
		"libnativetesthelper_jni", // depends on unconverted modules: libgtest_ndk_c++
		"libprotobuf-java-nano", // b/220869005, depends on non-public_current SDK
		"libstatslog", // depends on unconverted modules: libstatspull, statsd-aidl-ndk
		"libstatslog_art", // depends on unconverted modules: statslog_art.cpp, statslog_art.h
		"linker_reloc_bench_main", // depends on unconverted modules: liblinker_reloc_bench_*
		@@ -1396,6 +1395,16 @@ var (

		// TODO(b/266459895): depends on libunwindstack
		"libutils_test",

		// TODO(b/274805756): Support core_platform and current java APIs
		"fake-framework",

		// TODO(b/277616982): These modules depend on private java APIs, but maybe they don't need to.
		"StreamingProtoTest",
		"textclassifierprotoslite",
		"styleprotoslite",
		"CtsPkgInstallerConstants",
		"guava-android-testlib",
		}

		MixedBuildsDisabledList = []string{

bp2build/aar_conversion_test.go

+5 −2

Original line number	Diff line number	Diff line
		@@ -66,9 +66,12 @@ android_library {
		"resource_files": `["res/res.png"]`,
		"deps": `[":static_lib_dep"]`,
		"exports": `[":static_lib_dep"]`,
		"javacopts": `["-source 1.7 -target 1.7"]`,
		"java_version": `"7"`,
		}),
		MakeNeverlinkDuplicateTarget("android_library", "TestLib"),
		MakeNeverlinkDuplicateTargetWithAttrs(
		"android_library",
		"TestLib",
		AttrNameToString{"java_version": `"7"`}),
		}})
		}

bp2build/android_app_conversion_test.go

+6 −1

Original line number	Diff line number	Diff line
		@@ -53,6 +53,7 @@ android_app {
		"srcs": `["app.java"]`,
		"manifest": `"AndroidManifest.xml"`,
		"resource_files": `["res/res.png"]`,
		"sdk_version": `"current"`,
		}),
		}})
		}
		@@ -91,7 +92,8 @@ android_app {
		]`,
		"custom_package": `"com.google"`,
		"deps": `[":static_lib_dep"]`,
		"javacopts": `["-source 1.7 -target 1.7"]`,
		"java_version": `"7"`,
		"sdk_version": `"current"`,
		"certificate_name": `"foocert"`,
		}),
		}})
		@@ -131,6 +133,7 @@ android_app {
		})`,
		"manifest": `"AndroidManifest.xml"`,
		"resource_files": `["res/res.png"]`,
		"sdk_version": `"current"`,
		}),
		}})
		}
		@@ -365,6 +368,7 @@ android_app {
		"manifest_values": `{
		"minSdkVersion": "24",
		}`,
		"sdk_version": `"current"`,
		}),
		}})
		}
		@@ -388,6 +392,7 @@ android_app {
		"manifest_values": `{
		"minSdkVersion": "30",
		}`,
		"sdk_version": `"30"`,
		}),
		}})
		}

bp2build/java_binary_host_conversion_test.go

+11 −11

Original line number	Diff line number	Diff line
		@@ -59,22 +59,22 @@ func TestJavaBinaryHost(t *testing.T) {
		MakeBazelTarget("java_library", "java-binary-host-1_lib", AttrNameToString{
		"srcs": `["a.java"]`,
		"deps": `["//other:jni-lib-1"]`,
		"javacopts": `[
		"-Xdoclint:all/protected",
		"-source 1.8 -target 1.8",
		]`,
		"java_version": `"8"`,
		"javacopts": `["-Xdoclint:all/protected"]`,
		"target_compatible_with": `select({
		"//build/bazel/platforms/os:android": ["@platforms//:incompatible"],
		"//conditions:default": [],
		})`}),
		})`,
		}),
		MakeBazelTarget("java_binary", "java-binary-host-1", AttrNameToString{
		"main_class": `"com.android.test.MainClass"`,
		"jvm_flags": `["-Djava.library.path=$${RUNPATH}other"]`,
		"runtime_deps": `[":java-binary-host-1_lib"]`,
		"target_compatible_with": `select({
		"//build/bazel/platforms/os:android": ["@platforms//:incompatible"],
		"//conditions:default": [],
		})`}),
		})`,
		"runtime_deps": `[":java-binary-host-1_lib"]`,
		}),
		},
		})
		}

bp2build/java_host_for_device_conversion_test.go

+4 −2

Original line number	Diff line number	Diff line
		@@ -51,9 +51,11 @@ java_library {
		}`,
		ExpectedBazelTargets: []string{
		MakeBazelTarget("java_host_for_device", "java-lib-1", AttrNameToString{
		"deps": `[":java-lib-2"]`,
		"exports": `[":java-lib-2"]`,
		}),
		MakeNeverlinkDuplicateTargetWithAttrs("java_library", "java-lib-1", AttrNameToString{
		"sdk_version": `"none"`,
		}),
		MakeNeverlinkDuplicateTarget("java_library", "java-lib-1"),
		MakeBazelTarget("java_library", "java-lib-2", AttrNameToString{
		"srcs": `["b.java"]`,
		}),