Revert "Prohibit static executable in APEX"
This reverts commit 3a8130c797
.
Reason for revert: Build failed.
Change-Id: I28c72c8c3adaeb23bff9bffe3994971aa3f2e4f4
This commit is contained in:
@@ -374,6 +374,7 @@ func TestBasicApex(t *testing.T) {
|
||||
symlinks: ["foo_link_"],
|
||||
symlink_preferred_arch: true,
|
||||
system_shared_libs: [],
|
||||
static_executable: true,
|
||||
stl: "none",
|
||||
apex_available: [ "myapex", "com.android.gki.*" ],
|
||||
}
|
||||
@@ -2493,6 +2494,7 @@ func TestFilesInSubDir(t *testing.T) {
|
||||
srcs: ["mylib.cpp"],
|
||||
relative_install_path: "foo/bar",
|
||||
system_shared_libs: [],
|
||||
static_executable: true,
|
||||
stl: "none",
|
||||
apex_available: [ "myapex" ],
|
||||
}
|
||||
@@ -2552,6 +2554,7 @@ func TestFilesInSubDirWhenNativeBridgeEnabled(t *testing.T) {
|
||||
name: "mybin",
|
||||
relative_install_path: "foo/bar",
|
||||
system_shared_libs: [],
|
||||
static_executable: true,
|
||||
stl: "none",
|
||||
apex_available: [ "myapex" ],
|
||||
native_bridge_supported: true,
|
||||
@@ -8185,33 +8188,6 @@ func TestApexJavaCoverage(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestProhibitStaticExecutable(t *testing.T) {
|
||||
testApexError(t, `executable mybin is static`, `
|
||||
apex {
|
||||
name: "myapex",
|
||||
key: "myapex.key",
|
||||
binaries: ["mybin"],
|
||||
min_sdk_version: "29",
|
||||
}
|
||||
|
||||
apex_key {
|
||||
name: "myapex.key",
|
||||
public_key: "testkey.avbpubkey",
|
||||
private_key: "testkey.pem",
|
||||
}
|
||||
|
||||
cc_binary {
|
||||
name: "mybin",
|
||||
srcs: ["mylib.cpp"],
|
||||
relative_install_path: "foo/bar",
|
||||
static_executable: true,
|
||||
system_shared_libs: [],
|
||||
stl: "none",
|
||||
apex_available: [ "myapex" ],
|
||||
}
|
||||
`)
|
||||
}
|
||||
|
||||
func TestMain(m *testing.M) {
|
||||
os.Exit(m.Run())
|
||||
}
|
||||
|
Reference in New Issue
Block a user