Merge "Revert "Prevent statically linking to a lib providing stable C APIs""

1 files changed, 0 insertions, 36 deletions

diff --git a/apex/apex_test.go b/apex/apex_test.go
index 81df02a05..dc6986244 100644
--- a/apex/apex_test.go
+++ b/apex/apex_test.go
@@ -4774,42 +4774,6 @@ func TestTestFor(t *testing.T) {
 	ensureNotContains(t, ldFlags, "mylib/android_arm64_armv8-a_shared_1/mylib.so")
 }
 
-func TestNoStaticLinkingToStubsLib(t *testing.T) {
-	testApexError(t, `.*required by "mylib" is a native library providing stub.*`, `
-		apex {
-			name: "myapex",
-			key: "myapex.key",
-			native_shared_libs: ["mylib"],
-		}
-
-		apex_key {
-			name: "myapex.key",
-			public_key: "testkey.avbpubkey",
-			private_key: "testkey.pem",
-		}
-
-		cc_library {
-			name: "mylib",
-			srcs: ["mylib.cpp"],
-			static_libs: ["otherlib"],
-			system_shared_libs: [],
-			stl: "none",
-			apex_available: [ "myapex" ],
-		}
-
-		cc_library {
-			name: "otherlib",
-			srcs: ["mylib.cpp"],
-			system_shared_libs: [],
-			stl: "none",
-			stubs: {
-				versions: ["1", "2", "3"],
-			},
-			apex_available: [ "myapex" ],
-		}
-	`)
-}
-
 func TestMain(m *testing.M) {
 	run := func() int {
 		setUp()