Snap for 7183507 from 0ccdbe6bc010ed6cc085b89d125851557566b687 to sdk-release
Change-Id: I76198a74295150192b67b652c08a6021aa9426dd
diff --git a/Android.bp b/Android.bp
index c3f7c44..ab838c5 100644
--- a/Android.bp
+++ b/Android.bp
@@ -14,6 +14,10 @@
// limitations under the License.
//
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
python_defaults {
name: "gki_python_defaults",
libs: [
@@ -82,6 +86,7 @@
key: "com.android.gki.key",
// Key to sign APEX. Left empty to use defaults.
certificate: "",
+ updatable: false,
}
// Helper binary to build APEX manifest for GKI.
diff --git a/OWNERS b/OWNERS
index 2e142bc..554504b 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,4 +1,5 @@
elsk@google.com
-smuckle@google.com
+sspatil@google.com
+tkjos@google.com
per-file ota_from_raw_image.py=xunchang@google.com
diff --git a/TEST_MAPPING b/TEST_MAPPING
index e3e017d..592bd85 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -4,10 +4,6 @@
"name": "libkver_test"
},
{
- "name": "libkver_test",
- "host": true
- },
- {
"name": "GkiInstallTest"
}
]
diff --git a/build/Android.bp b/build/Android.bp
index a991224..d9cb6ff 100644
--- a/build/Android.bp
+++ b/build/Android.bp
@@ -12,6 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
bootstrap_go_package {
name: "gki-soong-rules",
pkgPath: "android/soong/gki",
diff --git a/build_gki_apex_manifest.cpp b/build_gki_apex_manifest.cpp
index 796f1ad..016c216 100644
--- a/build_gki_apex_manifest.cpp
+++ b/build_gki_apex_manifest.cpp
@@ -46,7 +46,8 @@
root["name"] = apex_name;
root["version"] = apex_version;
root["preInstallHook"] = "bin/com.android.gki.preinstall";
- std::string json_string = Json::StyledWriter().write(root);
+ Json::StreamWriterBuilder factory;
+ std::string json_string = Json::writeString(factory, root);
if (!android::base::WriteStringToFile(json_string, out_file)) {
PLOG(ERROR) << "Cannot write to " << out_file;
return EX_SOFTWARE;
diff --git a/libkver/Android.bp b/libkver/Android.bp
index bdff936..476ea4e 100644
--- a/libkver/Android.bp
+++ b/libkver/Android.bp
@@ -13,6 +13,10 @@
// limitations under the License.
// A library to parse kernel versions, including kernel releases and KMI versions.
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
cc_defaults {
name: "libkver-defaults",
cflags: [
diff --git a/sysprop/Android.bp b/sysprop/Android.bp
index b2d0e20..4588fa8 100644
--- a/sysprop/Android.bp
+++ b/sysprop/Android.bp
@@ -14,6 +14,10 @@
// limitations under the License.
//
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
sysprop_library {
name: "gkiprops",
property_owner: "Platform",
diff --git a/test/Android.bp b/test/Android.bp
index 528a3eb..483b6d9 100644
--- a/test/Android.bp
+++ b/test/Android.bp
@@ -13,6 +13,10 @@
// limitations under the License.
// A list of names of test APEXes for GkiInstallTest to instantiate test cases.
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
genrule {
name: "gki_install_test_file_list",
srcs: [":gki_install_test_files"],
