Commit 685cbe60 authored Mar 01, 2021 by Lorenzo Colitti

Disable -current shims in mainline-prod.

The current shims will in general fail to build in mainline-prod
because they depend on APIs that do not exist there.

Disable them.

The Merged-In clause comes from the unrelated change
aosp/1605016. It is intended to ensure that this change does not
merge into any downstream branches.

Bug: 167645754
Test: m NetworkStack CtsNetTestCasesLatestSdk CtsHostsideNetworkTests CtsHostsideNetworkTestsApp
Change-Id: I9d37a261ac31c97c3a6e9d5153619ab30dc07eb2
Merged-In: I2ec0aa737804cc3ea5fce9326f84c1e4b5e4972c

parent fb0f3056

Android.bp

+2 −0

Original line number	Diff line number	Diff line
		@@ -113,6 +113,7 @@ java_library {
		// integer so if the next SDK release happens to use that integer, we don't need to rename them.
		java_library {
		name: "NetworkStackApi31Shims",
		enabled: false, // Disabled in mainline-prod
		defaults: ["NetworkStackShimsDefaults"],
		srcs: [
		"apishim/31/*/.java",
		@@ -131,6 +132,7 @@ java_library {
		// called directly by the networkstack code.
		java_library {
		name: "NetworkStackApiCurrentShims",
		enabled: false, // Disabled in mainline-prod
		defaults: ["NetworkStackShimsDefaults"],
		static_libs: [
		"NetworkStackShimsCommon",