Remove -include <file> when compiling stubs.
Otherwise, the force included headers might cause conflicting types error with the symbols in the generated stubs source code. e.g. double acos(double); // in header void acos() {} // in the generated source code Bug: 120266448 Test: m (apex_test also updated, and passing) Change-Id: I717df990959d1b24ec515f0f52a4e28b94e92f32
This commit is contained in:
@@ -267,6 +267,7 @@ func TestApexWithStubs(t *testing.T) {
|
||||
cc_library {
|
||||
name: "mylib2",
|
||||
srcs: ["mylib.cpp"],
|
||||
cflags: ["-include mylib.h"],
|
||||
system_shared_libs: [],
|
||||
stl: "none",
|
||||
stubs: {
|
||||
@@ -316,6 +317,10 @@ func TestApexWithStubs(t *testing.T) {
|
||||
ensureContains(t, mylibLdFlags, "mylib3/android_arm64_armv8-a_shared_myapex/mylib3.so")
|
||||
// .. and not linking to the stubs variant of mylib3
|
||||
ensureNotContains(t, mylibLdFlags, "mylib3/android_arm64_armv8-a_shared_12_myapex/mylib3.so")
|
||||
|
||||
// Ensure that stubs libs are built without -include flags
|
||||
mylib2Cflags := ctx.ModuleForTests("mylib2", "android_arm64_armv8-a_static_myapex").Rule("cc").Args["cFlags"]
|
||||
ensureNotContains(t, mylib2Cflags, "-include ")
|
||||
}
|
||||
|
||||
func TestApexWithExplicitStubsDependency(t *testing.T) {
|
||||
|
Reference in New Issue
Block a user