Revert "Export static libraries."
This reverts commit 9d5ca159dc2bc56948f011745122bfba172d492d.
Reason for revert: This broke few builds.
Change-Id: Id9c4d7c145602a55ae07bb177f2c236e16f4fb63
diff --git a/cc/androidmk.go b/cc/androidmk.go
index 69ed771..324b5bc 100644
--- a/cc/androidmk.go
+++ b/cc/androidmk.go
@@ -70,12 +70,6 @@
if len(c.Properties.AndroidMkSharedLibs) > 0 {
fmt.Fprintln(w, "LOCAL_SHARED_LIBRARIES := "+strings.Join(c.Properties.AndroidMkSharedLibs, " "))
}
- if len(c.Properties.AndroidMkStaticLibs) > 0 {
- fmt.Fprintln(w, "LOCAL_STATIC_LIBRARIES := "+strings.Join(c.Properties.AndroidMkStaticLibs, " "))
- }
- if len(c.Properties.AndroidMkWholeStaticLibs) > 0 {
- fmt.Fprintln(w, "LOCAL_WHOLE_STATIC_LIBRARIES := "+strings.Join(c.Properties.AndroidMkWholeStaticLibs, " "))
- }
fmt.Fprintln(w, "LOCAL_SOONG_LINK_TYPE :=", c.getMakeLinkType())
if c.useVndk() {
fmt.Fprintln(w, "LOCAL_USE_VNDK := true")
diff --git a/cc/cc.go b/cc/cc.go
index 66018d0..0569563 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -176,12 +176,10 @@
// Minimum sdk version supported when compiling against the ndk
Sdk_version *string
- AndroidMkSharedLibs []string `blueprint:"mutated"`
- AndroidMkStaticLibs []string `blueprint:"mutated"`
- AndroidMkRuntimeLibs []string `blueprint:"mutated"`
- AndroidMkWholeStaticLibs []string `blueprint:"mutated"`
- HideFromMake bool `blueprint:"mutated"`
- PreventInstall bool `blueprint:"mutated"`
+ AndroidMkSharedLibs []string `blueprint:"mutated"`
+ AndroidMkRuntimeLibs []string `blueprint:"mutated"`
+ HideFromMake bool `blueprint:"mutated"`
+ PreventInstall bool `blueprint:"mutated"`
UseVndk bool `blueprint:"mutated"`
@@ -1481,15 +1479,9 @@
// they merely serve as Make dependencies and do not affect this lib itself.
c.Properties.AndroidMkSharedLibs = append(
c.Properties.AndroidMkSharedLibs, makeLibName(depName))
- case staticDepTag, staticExportDepTag, lateStaticDepTag:
- c.Properties.AndroidMkStaticLibs = append(
- c.Properties.AndroidMkStaticLibs, makeLibName(depName))
case runtimeDepTag:
c.Properties.AndroidMkRuntimeLibs = append(
c.Properties.AndroidMkRuntimeLibs, makeLibName(depName))
- case wholeStaticDepTag:
- c.Properties.AndroidMkWholeStaticLibs = append(
- c.Properties.AndroidMkWholeStaticLibs, makeLibName(depName))
}
})
diff --git a/cc/cc_test.go b/cc/cc_test.go
index e0cc963..e4904f2 100644
--- a/cc/cc_test.go
+++ b/cc/cc_test.go
@@ -1549,43 +1549,6 @@
checkRuntimeLibs(t, []string{"libvendor_available1", "libvendor1"}, module)
}
-func checkStaticLibs(t *testing.T, expected []string, module *Module) {
- actual := module.Properties.AndroidMkStaticLibs
- if !reflect.DeepEqual(actual, expected) {
- t.Errorf("incorrect static_libs"+
- "\nactual: %v"+
- "\nexpected: %v",
- actual,
- expected,
- )
- }
-}
-
-const staticLibAndroidBp = `
- cc_library {
- name: "lib1",
- }
- cc_library {
- name: "lib2",
- static_libs: ["lib1"],
- }
-`
-
-func TestStaticLibDepExport(t *testing.T) {
- ctx := testCc(t, staticLibAndroidBp)
-
- // Check the shared version of lib2.
- variant := "android_arm64_armv8-a_core_shared"
- module := ctx.ModuleForTests("lib2", variant).Module().(*Module)
- checkStaticLibs(t, []string{"lib1", "libclang_rt.builtins-aarch64-android", "libatomic", "libgcc"}, module)
-
- // Check the static version of lib2.
- variant = "android_arm64_armv8-a_core_static"
- module = ctx.ModuleForTests("lib2", variant).Module().(*Module)
- // libc++_static is linked additionally.
- checkStaticLibs(t, []string{"lib1", "libc++_static", "libclang_rt.builtins-aarch64-android", "libatomic", "libgcc"}, module)
-}
-
var compilerFlagsTestCases = []struct {
in string
out bool