|
@@ -3328,17 +3328,14 @@ func TestMacro(t *testing.T) {
|
|
|
// non-APEX variant does not have __ANDROID_APEX__ defined
|
|
|
mylibCFlags := ctx.ModuleForTests("mylib", "android_arm64_armv8-a_static").Rule("cc").Args["cFlags"]
|
|
|
ensureNotContains(t, mylibCFlags, "-D__ANDROID_APEX__")
|
|
|
- ensureNotContains(t, mylibCFlags, "-D__ANDROID_APEX_MIN_SDK_VERSION__")
|
|
|
|
|
|
- // APEX variant has __ANDROID_APEX__ and __ANDROID_APEX_SDK__ defined
|
|
|
+ // APEX variant has __ANDROID_APEX__ and __ANDROID_APEX__ defined
|
|
|
mylibCFlags = ctx.ModuleForTests("mylib", "android_arm64_armv8-a_static_apex10000").Rule("cc").Args["cFlags"]
|
|
|
ensureContains(t, mylibCFlags, "-D__ANDROID_APEX__")
|
|
|
- ensureContains(t, mylibCFlags, "-D__ANDROID_APEX_MIN_SDK_VERSION__=10000")
|
|
|
|
|
|
- // APEX variant has __ANDROID_APEX__ and __ANDROID_APEX_SDK__ defined
|
|
|
+ // APEX variant has __ANDROID_APEX__ and __ANDROID_APEX__ defined
|
|
|
mylibCFlags = ctx.ModuleForTests("mylib", "android_arm64_armv8-a_static_apex29").Rule("cc").Args["cFlags"]
|
|
|
ensureContains(t, mylibCFlags, "-D__ANDROID_APEX__")
|
|
|
- ensureContains(t, mylibCFlags, "-D__ANDROID_APEX_MIN_SDK_VERSION__=29")
|
|
|
|
|
|
// When a cc_library sets use_apex_name_macro: true each apex gets a unique variant and
|
|
|
// each variant defines additional macros to distinguish which apex variant it is built for
|
|
@@ -3347,19 +3344,17 @@ func TestMacro(t *testing.T) {
|
|
|
mylibCFlags = ctx.ModuleForTests("mylib3", "android_arm64_armv8-a_static").Rule("cc").Args["cFlags"]
|
|
|
ensureNotContains(t, mylibCFlags, "-D__ANDROID_APEX__")
|
|
|
|
|
|
- // recovery variant does not set __ANDROID_APEX_MIN_SDK_VERSION__
|
|
|
+ // recovery variant does not set __ANDROID_APEX__
|
|
|
mylibCFlags = ctx.ModuleForTests("mylib3", "android_recovery_arm64_armv8-a_static").Rule("cc").Args["cFlags"]
|
|
|
ensureNotContains(t, mylibCFlags, "-D__ANDROID_APEX__")
|
|
|
- ensureNotContains(t, mylibCFlags, "-D__ANDROID_APEX_MIN_SDK_VERSION__")
|
|
|
|
|
|
// non-APEX variant does not have __ANDROID_APEX__ defined
|
|
|
mylibCFlags = ctx.ModuleForTests("mylib2", "android_arm64_armv8-a_static").Rule("cc").Args["cFlags"]
|
|
|
ensureNotContains(t, mylibCFlags, "-D__ANDROID_APEX__")
|
|
|
|
|
|
- // recovery variant does not set __ANDROID_APEX_MIN_SDK_VERSION__
|
|
|
+ // recovery variant does not set __ANDROID_APEX__
|
|
|
mylibCFlags = ctx.ModuleForTests("mylib2", "android_recovery_arm64_armv8-a_static").Rule("cc").Args["cFlags"]
|
|
|
ensureNotContains(t, mylibCFlags, "-D__ANDROID_APEX__")
|
|
|
- ensureNotContains(t, mylibCFlags, "-D__ANDROID_APEX_MIN_SDK_VERSION__")
|
|
|
}
|
|
|
|
|
|
func TestHeaderLibsDependency(t *testing.T) {
|