Delete __ANDROID_APEX_MIN_SDK_VERSION__ from Soong

Currently, Bazel sets __ANDROID_APEX_MIN_SDK_VERSION__ based on the cc library's min_sdk_version while Soong does based on apex's min_sdk_version. This causes a diff in the clang commands.

Digging further, we realized __ANDROID_APEX_MIN_SDK_VERSION__ isn't used anywhere so we might just delete it altogether instead of fixing it.

Bug: 265134933
Test: presubmit
Change-Id: I08e89dc8f6ef86669248ea5c47de6603e9d2ffbb
This commit is contained in:
Vinh Tran
2023-01-19 22:41:46 -05:00
parent 733b1b78fa
commit f9754735f2
3 changed files with 4 additions and 19 deletions

View File

@@ -15,7 +15,6 @@
package rust
import (
"fmt"
"strings"
"github.com/google/blueprint"
@@ -178,10 +177,6 @@ func (b *bindgenDecorator) GenerateSource(ctx ModuleContext, deps PathDeps) andr
if mctx, ok := ctx.(*moduleContext); ok && mctx.apexVariationName() != "" {
cflags = append(cflags, "-D__ANDROID_APEX__")
if ctx.Device() {
cflags = append(cflags, fmt.Sprintf("-D__ANDROID_APEX_MIN_SDK_VERSION__=%d",
ctx.RustModule().apexSdkVersion.FinalOrFutureInt()))
}
}
if ctx.Target().NativeBridge == android.NativeBridgeEnabled {