StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Prework for migrating min_sdk_version from (kind+level) ..."

Browse Source 
Revert submission 2457063

Reason for revert: Broken udc-dev

Reverted changes: /q/submissionid:2457063

Change-Id: Ia17c962b9506c2bc9eaffdb34e99fc2082d42721
This commit is contained in:
Spandan Das
2023-03-21 01:36:46 +00:00
parent 1962415878
commit 7f88a03f88
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sdk/bootclasspath_fragment_sdk_test.go
View File

@@ -839,7 +839,6 @@ func TestSnapshotWithBootclasspathFragment_HiddenAPI(t *testing.T) {
compile_dex: true, compile_dex: true,
public: {enabled: true}, public: {enabled: true},
permitted_packages: ["mysdklibrary"], permitted_packages: ["mysdklibrary"],
min_sdk_version: "current",
} }
java_sdk_library { java_sdk_library {

2
sdk/update.go
View File

@@ -319,7 +319,7 @@ func (s *sdk) buildSnapshot(ctx android.ModuleContext, sdkVariants []*sdk) {
targetBuildRelease := s.targetBuildRelease(ctx) targetBuildRelease := s.targetBuildRelease(ctx)
targetApiLevel, err := android.ApiLevelFromUser(ctx, targetBuildRelease.name) targetApiLevel, err := android.ApiLevelFromUser(ctx, targetBuildRelease.name)
if err != nil { if err != nil {
targetApiLevel = android.InvalidApiLevel targetApiLevel = android.FutureApiLevel
} }
// Aggregate all the sdkMemberVariantDep instances from all the sdk variants. // Aggregate all the sdkMemberVariantDep instances from all the sdk variants.