Skip to content

Commit

Permalink
Test case for #125, along with periodic updates
Browse files Browse the repository at this point in the history
 - kotlin: 1.9.0
 - gradle: 8.2.1
 - helper: update crypto helper
 - capex: partial update
  • Loading branch information
cfig committed Jul 14, 2023
1 parent 0a795fc commit 82ff521
Show file tree
Hide file tree
Showing 19 changed files with 6,197 additions and 126 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@
[submodule "src/integrationTest/resources_2"]
path = src/integrationTest/resources_2
url = https://gitee.com/cfig/android_image_res2.git
[submodule "src/integrationTest/resources_3"]
path = src/integrationTest/resources_3
url = https://github.com/cfig/android_image_res3.git
45 changes: 45 additions & 0 deletions aosp/avb/test/vts-testcase/security/avb/data/Android.bp
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
package {
default_applicable_licenses: ["Android-Apache-2.0"],
}

filegroup {
name: "q-gsi_avbpubkey",
srcs: [
"q-gsi.avbpubkey",
],
}

filegroup {
name: "r-gsi_avbpubkey",
srcs: [
"r-gsi.avbpubkey",
],
}

filegroup {
name: "s-gsi_avbpubkey",
srcs: [
"s-gsi.avbpubkey",
],
}

filegroup {
name: "t-gsi_avbpubkey",
srcs: [
"t-gsi.avbpubkey",
],
}

filegroup {
name: "qcar-gsi_avbpubkey",
srcs: [
"qcar-gsi.avbpubkey",
],
}

filegroup {
name: "kernel_version_matrix.textproto",
srcs: [
"kernel_version_matrix.textproto"
],
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
# Copyright (C) 2023 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

# https://source.android.com/docs/core/architecture/kernel/android-common#compatibility-matrix
release_requirements: [
{
# Android 13
# This is the minimum SDK level where we start enforcing the matrix.
key: 33
value {
upgrade: [
# -q, -stable are dropped from non-GKI kernel release formats because the kernel branch
# cannot be looked up anywhere.
"android-4.9",
"android-4.14",
"android-4.19",
"android11-5.4",
"android12-5.4",
"android12-5.10",
"android13-5.10",
"android13-5.15"
]
launch: [
"android11-5.4",
"android12-5.4",
"android12-5.10",
"android13-5.10",
"android13-5.15"
]
launch_grf: [
# -q, -stable are dropped from non-GKI kernel release formats because the kernel branch
# cannot be looked up anywhere.
"android-4.19",
"android11-5.4",
"android12-5.4",
"android12-5.10",
"android13-5.10",
"android13-5.15"
]
}
},
{
# Android 14
key: 34
value {
upgrade: [
# -q, -stable are dropped from non-GKI kernel release formats because the kernel branch
# cannot be looked up anywhere.
"android-4.14",
"android-4.19",
"android11-5.4",
"android12-5.4",
"android12-5.10",
"android13-5.10",
"android13-5.15",
"android14-5.15",
"android14-6.1"
]
launch: [
"android12-5.10",
"android13-5.10",
"android13-5.15",
"android14-5.15",
"android14-6.1"
]
launch_grf: [
# -q, -stable are dropped from non-GKI kernel release formats because the kernel branch
# cannot be looked up anywhere.
"android-4.19",
"android11-5.4",
"android12-5.4",
"android12-5.10",
"android13-5.10",
"android13-5.15",
"android14-5.15",
"android14-6.1"
]
}
}
]
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion bbootimg/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
kotlin("jvm") version "1.8.0"
kotlin("jvm") version "1.9.0"
application
}

Expand Down
Loading

0 comments on commit 82ff521

Please sign in to comment.