Merge "Fix remote execution of r8 and d8 in make"
diff --git a/core/Makefile b/core/Makefile
index a150ee4..2595101 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -4576,6 +4576,7 @@
$(INSTALLED_VBMETAIMAGE_TARGET): PRIVATE_AVB_VBMETA_SIGNING_ARGS := \
--algorithm $(BOARD_AVB_ALGORITHM) --key $(BOARD_AVB_KEY_PATH)
+
$(INSTALLED_VBMETAIMAGE_TARGET): \
$(AVBTOOL) \
$(INSTALLED_BOOTIMAGE_TARGET) \
@@ -4596,10 +4597,10 @@
$(INSTALLED_RECOVERYIMAGE_TARGET) \
$(INSTALLED_VBMETA_SYSTEMIMAGE_TARGET) \
$(INSTALLED_VBMETA_VENDORIMAGE_TARGET) \
- $(foreach partition,$(call to-upper,$( BOARD_AVB_VBMETA_CUSTOM_PARTITIONS)),$(INSTALLED_VBMETA_$(partition)IMAGE_TARGET)) \
+ $(foreach partition,$(call to-upper,$(BOARD_AVB_VBMETA_CUSTOM_PARTITIONS)),$(INSTALLED_VBMETA_$(partition)IMAGE_TARGET)) \
$(BOARD_AVB_VBMETA_SYSTEM_KEY_PATH) \
$(BOARD_AVB_VBMETA_VENDOR_KEY_PATH) \
- $(foreach partition,$(call to-upper,$( BOARD_AVB_VBMETA_CUSTOM_PARTITIONS)),$(BOARD_AVB_VBMETA_$(partition)_KEY_PATH)) \
+ $(foreach partition,$(call to-upper,$(BOARD_AVB_VBMETA_CUSTOM_PARTITIONS)),$(BOARD_AVB_VBMETA_$(partition)_KEY_PATH)) \
$(BOARD_AVB_KEY_PATH)
$(build-vbmetaimage-target)
@@ -5104,7 +5105,7 @@
INTERNAL_OTATOOLS_MODULES += \
apexer \
apex_compression_tool \
- blkid \
+ blkid_static \
deapexer \
debugfs_static \
dump_apex_info \
diff --git a/core/binary.mk b/core/binary.mk
index 6320726..6f1d814 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -58,6 +58,9 @@
my_cppflags := $(LOCAL_CPPFLAGS)
my_cflags_no_override := $(GLOBAL_CLANG_CFLAGS_NO_OVERRIDE)
my_cppflags_no_override := $(GLOBAL_CLANG_CPPFLAGS_NO_OVERRIDE)
+ifeq ($(my_32_64_bit_suffix), 64)
+ my_cflags_no_override += $(GLOBAL_CLANG_CFLAGS_64_NO_OVERRIDE)
+endif
ifdef is_third_party
my_cflags_no_override += $(GLOBAL_CLANG_EXTERNAL_CFLAGS_NO_OVERRIDE)
my_cppflags_no_override += $(GLOBAL_CLANG_EXTERNAL_CFLAGS_NO_OVERRIDE)
diff --git a/core/proguard_basic_keeps.flags b/core/proguard_basic_keeps.flags
index 7e7b270..ea200c1 100644
--- a/core/proguard_basic_keeps.flags
+++ b/core/proguard_basic_keeps.flags
@@ -83,13 +83,14 @@
# 1) runtime-visible annotations will still be kept, and 2) compile-time
# annotations are stripped by R8 anyway.
# Note: The ** prefix is used to accommodate jarjar repackaging.
-# TODO(b/242088131): Remove these exemptions after resolving transitive libs
-# dependencies that are provided to R8.
+# TODO(b/266561579): Remove this exemptions after resolving jarjar-ed transitive libs
-dontwarn **android**.annotation*.**
--dontwarn **com.google.errorprone.annotations.**
--dontwarn javax.annotation.**
--dontwarn org.checkerframework.**
--dontwarn org.jetbrains.annotations.**
+
+# These classes generate warnings of the kind `Library class extends program class`
+# because some apps have deps that statically include the same libraries as the app,
+# and r8 complains that a library is implementing a class provided by the app (the "program").
+-dontwarn com.google.protobuf.**
+-dontwarn kotlin.reflect.jvm.internal.ReflectionFactoryImpl
# Less spammy.
-dontnote
diff --git a/envsetup.sh b/envsetup.sh
index a30f6bd..ab86d5f 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -79,6 +79,7 @@
- ggrep: Greps on all local Gradle files.
- gogrep: Greps on all local Go files.
- jgrep: Greps on all local Java files.
+- jsongrep: Greps on all local Json files.
- ktgrep: Greps on all local Kotlin files.
- resgrep: Greps on all local res/*.xml files.
- mangrep: Greps on all local AndroidManifest.xml files.
@@ -87,6 +88,7 @@
- rsgrep: Greps on all local Rust files.
- sepgrep: Greps on all local sepolicy files.
- sgrep: Greps on all local source files.
+- tomlgrep: Greps on all local Toml files.
- pygrep: Greps on all local Python files.
- godir: Go to the directory containing a file.
- allmod: List all modules.
@@ -1236,6 +1238,18 @@
-exec grep --color -n "$@" {} +
}
+function jsongrep()
+{
+ find . -name .repo -prune -o -name .git -prune -o -name out -prune -o -type f -name "*\.json" \
+ -exec grep --color -n "$@" {} +
+}
+
+function tomlgrep()
+{
+ find . -name .repo -prune -o -name .git -prune -o -name out -prune -o -type f -name "*\.toml" \
+ -exec grep --color -n "$@" {} +
+}
+
function ktgrep()
{
find . -name .repo -prune -o -name .git -prune -o -name out -prune -o -type f -name "*\.kt" \
diff --git a/finalize-locally-mainline-sdk.sh b/finalize-locally-mainline-sdk.sh
new file mode 100755
index 0000000..c72ef8c
--- /dev/null
+++ b/finalize-locally-mainline-sdk.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+set -ex
+
+function finalize_locally_mainline_sdk() {
+ local MAINLINE_EXTENSION='6'
+
+ local top="$(dirname "$0")"/../..
+
+ # Bump SDK extension version.
+ "$top/packages/modules/SdkExtensions/gen_sdk/bump_sdk.sh" ${MAINLINE_EXTENSION}
+
+ local version_defaults="$top/build/make/core/version_defaults.mk"
+ sed -i -e "s/PLATFORM_SDK_EXTENSION_VERSION := .*/PLATFORM_SDK_EXTENSION_VERSION := ${MAINLINE_EXTENSION}/g" $version_defaults
+
+ # Build modules SDKs.
+ TARGET_BUILD_VARIANT=userdebug UNBUNDLED_BUILD_SDKS_FROM_SOURCE=true "$top/vendor/google/build/mainline_modules_sdks.sh"
+
+ # Update prebuilts.
+ "$top/prebuilts/build-tools/path/linux-x86/python3" "$top/packages/modules/common/tools/finalize_sdk.py" -l -b 0 -f ${MAINLINE_EXTENSION} -r '' 0
+}
+
+finalize_locally_mainline_sdk
+
diff --git a/finalize-sdk-rel.sh b/finalize-sdk-rel.sh
index 35899f7..b19e56a 100755
--- a/finalize-sdk-rel.sh
+++ b/finalize-sdk-rel.sh
@@ -14,7 +14,7 @@
# adb keys
$m adb
- LOGNAME=android-eng HOSTNAME=google.com adb keygen "$DEV_SRC_DIR/vendor/google/security/adb/${PLATFORM_VERSION}.adb_key"
+ LOGNAME=android-eng HOSTNAME=google.com "$DEV_SRC_DIR/out/host/linux-x86/bin/adb" keygen "$DEV_SRC_DIR/vendor/google/security/adb/${PLATFORM_VERSION}.adb_key"
# build/make/core/version_defaults.mk
sed -i -e "s/PLATFORM_VERSION_CODENAME.${BUILD_PREFIX} := .*/PLATFORM_VERSION_CODENAME.${BUILD_PREFIX} := REL/g" "$DEV_SRC_DIR/build/make/core/version_defaults.mk"
@@ -29,13 +29,13 @@
cp -r "$DEV_SRC_DIR/system/sepolicy/private/" "$DEV_SRC_DIR/system/sepolicy/prebuilts/api/${PLATFORM_SDK_VERSION}.0/"
# prebuilts/abi-dumps/ndk
- git -C "$DEV_SRC_DIR/prebuilts/abi-dumps/ndk" mv current ${PLATFORM_SDK_VERSION}
+ mv "$DEV_SRC_DIR/prebuilts/abi-dumps/ndk/current" "$DEV_SRC_DIR/prebuilts/abi-dumps/ndk/$PLATFORM_SDK_VERSION"
# prebuilts/abi-dumps/vndk
- git -C "$DEV_SRC_DIR/prebuilts/abi-dumps/vndk" mv ${PLATFORM_CODENAME} ${PLATFORM_SDK_VERSION}
+ mv "$DEV_SRC_DIR/prebuilts/abi-dumps/vndk/$PLATFORM_CODENAME" "$DEV_SRC_DIR/prebuilts/abi-dumps/vndk/$PLATFORM_SDK_VERSION"
# prebuilts/abi-dumps/platform
- git -C "$DEV_SRC_DIR/prebuilts/abi-dumps/platform" mv current ${PLATFORM_SDK_VERSION}
+ mv "$DEV_SRC_DIR/prebuilts/abi-dumps/platform/current" "$DEV_SRC_DIR/prebuilts/abi-dumps/platform/$PLATFORM_SDK_VERSION"
}
finalize_sdk_rel
diff --git a/finalize-step-1-for-build-target.sh b/finalize-step-1-for-build-target.sh
index 52cf0a7..8b35a1d 100755
--- a/finalize-step-1-for-build-target.sh
+++ b/finalize-step-1-for-build-target.sh
@@ -4,49 +4,10 @@
set -ex
-function revert_to_unfinalized_state() {
- declare -a projects=(
- "build/make/"
- "build/soong/"
- "cts/"
- "frameworks/base/"
- "frameworks/hardware/interfaces/"
- "frameworks/libs/modules-utils/"
- "frameworks/libs/net/"
- "hardware/interfaces/"
- "libcore/"
- "packages/services/Car/"
- "platform_testing/"
- "prebuilts/abi-dumps/ndk/"
- "prebuilts/abi-dumps/platform/"
- "prebuilts/abi-dumps/vndk/"
- "system/hardware/interfaces/"
- "system/tools/aidl/"
- "tools/platform-compat"
- "device/generic/car"
- "development"
- )
-
- for project in "${projects[@]}"
- do
- local git_path="$top/$project"
- echo "Reverting: $git_path"
- baselineHash="$(git -C $git_path log --format=%H --no-merges --max-count=1 --grep ^FINALIZATION_STEP_1_BASELINE_COMMIT)" ;
- if [[ $baselineHash ]]; then
- previousHash="$(git -C $git_path log --format=%H --no-merges --max-count=100 --grep ^FINALIZATION_STEP_1_SCRIPT_COMMIT $baselineHash..HEAD | tr \n \040)" ;
- else
- previousHash="$(git -C $git_path log --format=%H --no-merges --max-count=100 --grep ^FINALIZATION_STEP_1_SCRIPT_COMMIT | tr \n \040)" ;
- fi ;
- if [[ $previousHash ]]; then git -C $git_path revert --no-commit --strategy=ort --strategy-option=ours $previousHash ; fi ;
- done
-}
-
function finalize_step_1_main() {
local top="$(dirname "$0")"/../..
local m="$top/build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=aosp_arm64 TARGET_BUILD_VARIANT=userdebug"
- revert_to_unfinalized_state
-
# vndk etc finalization
source $top/build/make/finalize-aidl-vndk-sdk-resources.sh
diff --git a/finalize-step-1.sh b/finalize-step-1.sh
index 20bc2bf..8871862 100755
--- a/finalize-step-1.sh
+++ b/finalize-step-1.sh
@@ -32,6 +32,9 @@
}
function finalize_step_1_main() {
+ # deprecated, do not use
+ exit 1
+
local top="$(dirname "$0")"/../..
repo selfupdate
diff --git a/finalize-step-2-for-build-target.sh b/finalize-step-2-for-build-target.sh
index caf415f..b74fd03 100755
--- a/finalize-step-2-for-build-target.sh
+++ b/finalize-step-2-for-build-target.sh
@@ -4,55 +4,19 @@
set -ex
-function revert_to_unfinalized_state() {
- declare -a projects=(
- "build/make/"
- "build/soong/"
- "cts/"
- "frameworks/base/"
- "frameworks/hardware/interfaces/"
- "frameworks/libs/modules-utils/"
- "frameworks/libs/net/"
- "hardware/interfaces/"
- "libcore/"
- "packages/services/Car/"
- "platform_testing/"
- "prebuilts/abi-dumps/ndk/"
- "prebuilts/abi-dumps/platform/"
- "prebuilts/abi-dumps/vndk/"
- "system/hardware/interfaces/"
- "system/tools/aidl/"
- "tools/platform-compat"
- "device/generic/car"
- "development"
- )
-
- for project in "${projects[@]}"
- do
- local git_path="$top/$project"
- echo "Reverting: $git_path"
- baselineHash="$(git -C $git_path log --format=%H --no-merges --max-count=1 --grep ^FINALIZATION_STEP_1_BASELINE_COMMIT)" ;
- if [[ $baselineHash ]]; then
- previousHash="$(git -C $git_path log --format=%H --no-merges --max-count=100 --grep ^FINALIZATION_STEP_1_SCRIPT_COMMIT $baselineHash..HEAD | tr \n \040)" ;
- else
- previousHash="$(git -C $git_path log --format=%H --no-merges --max-count=100 --grep ^FINALIZATION_STEP_1_SCRIPT_COMMIT | tr \n \040)" ;
- fi ;
- if [[ $previousHash ]]; then git -C $git_path revert --no-commit --strategy=ort --strategy-option=ours $previousHash ; fi ;
- done
-}
-
function finalize_step_2_main() {
local top="$(dirname "$0")"/../..
local m="$top/build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=aosp_arm64 TARGET_BUILD_VARIANT=userdebug"
- revert_to_unfinalized_state
-
# vndk etc finalization
source $top/build/make/finalize-aidl-vndk-sdk-resources.sh
# prebuilts etc
source $top/build/make/finalize-sdk-rel.sh
+ # mainline sdk prebuilts
+ source $top/build/make/finalize-locally-mainline-sdk.sh
+
# build to confirm everything is OK
AIDL_FROZEN_REL=true $m
}
diff --git a/finalize-step-2.sh b/finalize-step-2.sh
index 627153b..ef80b2b 100755
--- a/finalize-step-2.sh
+++ b/finalize-step-2.sh
@@ -32,6 +32,9 @@
}
function finalize_step_2_main() {
+ # deprecated, do not use
+ exit 1
+
local top="$(dirname "$0")"/../..
repo selfupdate
diff --git a/target/board/BoardConfigEmuCommon.mk b/target/board/BoardConfigEmuCommon.mk
index 5acbe7f..7a07d70 100644
--- a/target/board/BoardConfigEmuCommon.mk
+++ b/target/board/BoardConfigEmuCommon.mk
@@ -34,7 +34,7 @@
BOARD_BUILD_SUPER_IMAGE_BY_DEFAULT := true
# 8G + 8M
- BOARD_SUPER_PARTITION_SIZE := 8598323200
+ BOARD_SUPER_PARTITION_SIZE ?= 8598323200
BOARD_SUPER_PARTITION_GROUPS := emulator_dynamic_partitions
ifeq ($(QEMU_USE_SYSTEM_EXT_PARTITIONS),true)
@@ -57,7 +57,7 @@
endif
# 8G
- BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE := 8589934592
+ BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE ?= 8589934592
# in build environment to speed up make -j
ifeq ($(QEMU_DISABLE_AVB),true)
diff --git a/target/product/AndroidProducts.mk b/target/product/AndroidProducts.mk
index 585630b..1e0ce19 100644
--- a/target/product/AndroidProducts.mk
+++ b/target/product/AndroidProducts.mk
@@ -36,6 +36,7 @@
PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/aosp_arm64.mk \
$(LOCAL_DIR)/aosp_arm.mk \
+ $(LOCAL_DIR)/aosp_riscv64.mk \
$(LOCAL_DIR)/aosp_x86_64.mk \
$(LOCAL_DIR)/aosp_x86.mk \
$(LOCAL_DIR)/full.mk \
diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index cabb172..b66d2c7 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -54,7 +54,6 @@
com.android.appsearch \
com.android.btservices \
com.android.conscrypt \
- com.android.cronet \
com.android.extservices \
com.android.i18n \
com.android.ipsec \
@@ -389,6 +388,7 @@
procrank \
profcollectd \
profcollectctl \
+ record_binder \
servicedispatcher \
showmap \
sqlite3 \
diff --git a/target/product/gsi/33.txt b/target/product/gsi/33.txt
index 03a143d..db05f93 100644
--- a/target/product/gsi/33.txt
+++ b/target/product/gsi/33.txt
@@ -79,7 +79,6 @@
VNDK-core: android.hardware.graphics.allocator@4.0.so
VNDK-core: android.hardware.graphics.bufferqueue@1.0.so
VNDK-core: android.hardware.graphics.bufferqueue@2.0.so
-VNDK-core: android.hardware.health-V1-ndk.so
VNDK-core: android.hardware.health.storage-V1-ndk.so
VNDK-core: android.hardware.identity-V4-ndk.so
VNDK-core: android.hardware.ir-V1-ndk.so
diff --git a/tools/compliance/cmd/sbom/sbom.go b/tools/compliance/cmd/sbom/sbom.go
index e031052..0f8a876 100644
--- a/tools/compliance/cmd/sbom/sbom.go
+++ b/tools/compliance/cmd/sbom/sbom.go
@@ -343,9 +343,9 @@
if isMainPackage {
mainPackage = getDocumentName(ctx, tn, pm)
fmt.Fprintf(ctx.stdout, "SPDXVersion: SPDX-2.2\n")
- fmt.Fprintf(ctx.stdout, "DataLicense: CC-1.0\n")
+ fmt.Fprintf(ctx.stdout, "DataLicense: CC0-1.0\n")
fmt.Fprintf(ctx.stdout, "DocumentName: %s\n", mainPackage)
- fmt.Fprintf(ctx.stdout, "SPDXID: SPDXRef-DOCUMENT-%s\n", mainPackage)
+ fmt.Fprintf(ctx.stdout, "SPDXID: SPDXRef-DOCUMENT\n")
fmt.Fprintf(ctx.stdout, "DocumentNamespace: Android\n")
fmt.Fprintf(ctx.stdout, "Creator: Organization: Google LLC\n")
fmt.Fprintf(ctx.stdout, "Created: %s\n", ctx.creationTime().Format("2006-01-02T15:04:05Z"))
@@ -363,8 +363,8 @@
}()
if len(path) == 0 {
relationships = append(relationships,
- fmt.Sprintf("Relationship: SPDXRef-DOCUMENT-%s DESCRIBES SPDXRef-Package-%s",
- mainPackage, getPackageName(ctx, tn)))
+ fmt.Sprintf("Relationship: SPDXRef-DOCUMENT DESCRIBES SPDXRef-Package-%s",
+ getPackageName(ctx, tn)))
} else {
// Check parent and identify annotation
parent := path[len(path)-1]
diff --git a/tools/compliance/cmd/sbom/sbom_test.go b/tools/compliance/cmd/sbom/sbom_test.go
index 4d623ce..6df74e2 100644
--- a/tools/compliance/cmd/sbom/sbom_test.go
+++ b/tools/compliance/cmd/sbom/sbom_test.go
@@ -30,9 +30,9 @@
var (
spdxVersionTag = regexp.MustCompile(`^\s*SPDXVersion: SPDX-2.2\s*$`)
- spdxDataLicenseTag = regexp.MustCompile(`^\s*DataLicense: CC-1.0\s*$`)
+ spdxDataLicenseTag = regexp.MustCompile(`^\s*DataLicense: CC0-1.0\s*$`)
spdxDocumentNameTag = regexp.MustCompile(`^\s*DocumentName:\s*Android*\s*$`)
- spdxIDTag = regexp.MustCompile(`^\s*SPDXID:\s*SPDXRef-DOCUMENT-(.*)\s*$`)
+ spdxIDTag = regexp.MustCompile(`^\s*SPDXID:\s*SPDXRef-DOCUMENT\s*$`)
spdxDocumentNameSpaceTag = regexp.MustCompile(`^\s*DocumentNamespace:\s*Android\s*$`)
spdxCreatorOrganizationTag = regexp.MustCompile(`^\s*Creator:\s*Organization:\s*Google LLC\s*$`)
spdxCreatedTimeTag = regexp.MustCompile(`^\s*Created: 1970-01-01T00:00:00Z\s*$`)
@@ -76,7 +76,7 @@
spdxVersion{},
spdxDataLicense{},
spdxDocumentName{"Android"},
- spdxID{"Android"},
+ spdxID{},
spdxDocumentNameSpace{},
spdxCreatorOrganization{},
spdxCreatedTime{},
@@ -85,7 +85,7 @@
spdxPkgID{"testdata/firstparty/highest.apex.meta_lic"},
spdxPkgDownloadLocation{"NOASSERTION"},
spdxPkgLicenseDeclared{"testdata-firstparty-FIRST_PARTY_LICENSE"},
- spdxRelationship{"DOCUMENT-Android ", "testdata-firstparty-highest.apex.meta_lic", "DESCRIBES"},
+ spdxRelationship{"DOCUMENT ", "testdata-firstparty-highest.apex.meta_lic", "DESCRIBES"},
packageTag{"testdata/firstparty/bin/bin1.meta_lic"},
packageName{"testdata/firstparty/bin/bin1.meta_lic"},
spdxPkgID{"testdata/firstparty/bin/bin1.meta_lic"},
@@ -148,7 +148,7 @@
spdxVersion{},
spdxDataLicense{},
spdxDocumentName{"Android"},
- spdxID{"Android"},
+ spdxID{},
spdxDocumentNameSpace{},
spdxCreatorOrganization{},
spdxCreatedTime{},
@@ -157,7 +157,7 @@
spdxPkgID{"testdata/firstparty/application.meta_lic"},
spdxPkgDownloadLocation{"NOASSERTION"},
spdxPkgLicenseDeclared{"testdata-firstparty-FIRST_PARTY_LICENSE"},
- spdxRelationship{"DOCUMENT-Android ", "testdata/firstparty/application.meta_lic", "DESCRIBES"},
+ spdxRelationship{"DOCUMENT ", "testdata/firstparty/application.meta_lic", "DESCRIBES"},
packageTag{"testdata/firstparty/bin/bin3.meta_lic"},
packageName{"testdata/firstparty/bin/bin3.meta_lic"},
spdxPkgID{"testdata/firstparty/bin/bin3.meta_lic"},
@@ -197,7 +197,7 @@
spdxVersion{},
spdxDataLicense{},
spdxDocumentName{"Android"},
- spdxID{"Android"},
+ spdxID{},
spdxDocumentNameSpace{},
spdxCreatorOrganization{},
spdxCreatedTime{},
@@ -206,7 +206,7 @@
spdxPkgID{"testdata/firstparty/container.zip.meta_lic"},
spdxPkgDownloadLocation{"NOASSERTION"},
spdxPkgLicenseDeclared{"testdata-firstparty-FIRST_PARTY_LICENSE"},
- spdxRelationship{"DOCUMENT-Android ", "testdata/firstparty/container.zip.meta_lic", "DESCRIBES"},
+ spdxRelationship{"DOCUMENT ", "testdata/firstparty/container.zip.meta_lic", "DESCRIBES"},
packageTag{"testdata/firstparty/bin/bin1.meta_lic"},
packageName{"testdata/firstparty/bin/bin1.meta_lic"},
spdxPkgID{"testdata/firstparty/bin/bin1.meta_lic"},
@@ -269,7 +269,7 @@
spdxVersion{},
spdxDataLicense{},
spdxDocumentName{"Android"},
- spdxID{"Android"},
+ spdxID{},
spdxDocumentNameSpace{},
spdxCreatorOrganization{},
spdxCreatedTime{},
@@ -278,7 +278,7 @@
spdxPkgID{"testdata/firstparty/bin/bin1.meta_lic"},
spdxPkgDownloadLocation{"NOASSERTION"},
spdxPkgLicenseDeclared{"testdata-firstparty-FIRST_PARTY_LICENSE"},
- spdxRelationship{"DOCUMENT-Android ", "testdata/firstparty/bin/bin1.meta_lic", "DESCRIBES"},
+ spdxRelationship{"DOCUMENT ", "testdata/firstparty/bin/bin1.meta_lic", "DESCRIBES"},
packageTag{"testdata/firstparty/lib/liba.so.meta_lic"},
packageName{"testdata/firstparty/lib/liba.so.meta_lic"},
spdxPkgID{"testdata/firstparty/lib/liba.so.meta_lic"},
@@ -311,7 +311,7 @@
spdxVersion{},
spdxDataLicense{},
spdxDocumentName{"Android"},
- spdxID{"Android"},
+ spdxID{},
spdxDocumentNameSpace{},
spdxCreatorOrganization{},
spdxCreatedTime{},
@@ -320,7 +320,7 @@
spdxPkgID{"testdata/firstparty/lib/libd.so.meta_lic"},
spdxPkgDownloadLocation{"NOASSERTION"},
spdxPkgLicenseDeclared{"testdata-firstparty-FIRST_PARTY_LICENSE"},
- spdxRelationship{"DOCUMENT-Android ", "testdata/firstparty/lib/libd.so.meta_lic", "DESCRIBES"},
+ spdxRelationship{"DOCUMENT ", "testdata/firstparty/lib/libd.so.meta_lic", "DESCRIBES"},
spdxLicense{},
spdxLicenseID{"testdata-firstparty-FIRST_PARTY_LICENSE"},
spdxExtractedText{"&&&First Party License&&&"},
@@ -339,7 +339,7 @@
spdxVersion{},
spdxDataLicense{},
spdxDocumentName{"Android"},
- spdxID{"Android"},
+ spdxID{},
spdxDocumentNameSpace{},
spdxCreatorOrganization{},
spdxCreatedTime{},
@@ -348,7 +348,7 @@
spdxPkgID{"testdata/notice/highest.apex.meta_lic"},
spdxPkgDownloadLocation{"NOASSERTION"},
spdxPkgLicenseDeclared{"testdata-firstparty-FIRST_PARTY_LICENSE"},
- spdxRelationship{"DOCUMENT-Android ", "testdata/notice/highest.apex.meta_lic", "DESCRIBES"},
+ spdxRelationship{"DOCUMENT ", "testdata/notice/highest.apex.meta_lic", "DESCRIBES"},
packageTag{"testdata/notice/bin/bin1.meta_lic"},
packageName{"testdata/notice/bin/bin1.meta_lic"},
spdxPkgID{"testdata/notice/bin/bin1.meta_lic"},
@@ -415,7 +415,7 @@
spdxVersion{},
spdxDataLicense{},
spdxDocumentName{"Android"},
- spdxID{"Android"},
+ spdxID{},
spdxDocumentNameSpace{},
spdxCreatorOrganization{},
spdxCreatedTime{},
@@ -424,7 +424,7 @@
spdxPkgID{"testdata/notice/container.zip.meta_lic"},
spdxPkgDownloadLocation{"NOASSERTION"},
spdxPkgLicenseDeclared{"testdata-firstparty-FIRST_PARTY_LICENSE"},
- spdxRelationship{"DOCUMENT-Android ", "testdata/notice/container.zip.meta_lic", "DESCRIBES"},
+ spdxRelationship{"DOCUMENT ", "testdata/notice/container.zip.meta_lic", "DESCRIBES"},
packageTag{"testdata/notice/bin/bin1.meta_lic"},
packageName{"testdata/notice/bin/bin1.meta_lic"},
spdxPkgID{"testdata/notice/bin/bin1.meta_lic"},
@@ -491,7 +491,7 @@
spdxVersion{},
spdxDataLicense{},
spdxDocumentName{"Android"},
- spdxID{"Android"},
+ spdxID{},
spdxDocumentNameSpace{},
spdxCreatorOrganization{},
spdxCreatedTime{},
@@ -500,7 +500,7 @@
spdxPkgID{"testdata/notice/application.meta_lic"},
spdxPkgDownloadLocation{"NOASSERTION"},
spdxPkgLicenseDeclared{"testdata-firstparty-FIRST_PARTY_LICENSE"},
- spdxRelationship{"DOCUMENT-Android ", "testdata-notice-application.meta_lic", "DESCRIBES"},
+ spdxRelationship{"DOCUMENT ", "testdata-notice-application.meta_lic", "DESCRIBES"},
packageTag{"testdata/notice/bin/bin3.meta_lic"},
packageName{"testdata/notice/bin/bin3.meta_lic"},
spdxPkgID{"testdata/notice/bin/bin3.meta_lic"},
@@ -544,7 +544,7 @@
spdxVersion{},
spdxDataLicense{},
spdxDocumentName{"Android"},
- spdxID{"Android"},
+ spdxID{},
spdxDocumentNameSpace{},
spdxCreatorOrganization{},
spdxCreatedTime{},
@@ -553,7 +553,7 @@
spdxPkgID{"testdata/notice/bin/bin1.meta_lic"},
spdxPkgDownloadLocation{"NOASSERTION"},
spdxPkgLicenseDeclared{"testdata-firstparty-FIRST_PARTY_LICENSE"},
- spdxRelationship{"DOCUMENT-Android ", "testdata/notice/bin/bin1.meta_lic", "DESCRIBES"},
+ spdxRelationship{"DOCUMENT ", "testdata/notice/bin/bin1.meta_lic", "DESCRIBES"},
packageTag{"testdata/notice/lib/liba.so.meta_lic"},
packageName{"testdata/notice/lib/liba.so.meta_lic"},
spdxPkgID{"testdata/notice/lib/liba.so.meta_lic"},
@@ -590,7 +590,7 @@
spdxVersion{},
spdxDataLicense{},
spdxDocumentName{"Android"},
- spdxID{"Android"},
+ spdxID{},
spdxDocumentNameSpace{},
spdxCreatorOrganization{},
spdxCreatedTime{},
@@ -599,7 +599,7 @@
spdxPkgID{"testdata/notice/lib/libd.so.meta_lic"},
spdxPkgDownloadLocation{"NOASSERTION"},
spdxPkgLicenseDeclared{"testdata-notice-NOTICE_LICENSE"},
- spdxRelationship{"DOCUMENT-Android ", "testdata/notice/lib/libd.so.meta_lic", "DESCRIBES"},
+ spdxRelationship{"DOCUMENT ", "testdata/notice/lib/libd.so.meta_lic", "DESCRIBES"},
spdxLicense{},
spdxLicenseID{"testdata-notice-NOTICE_LICENSE"},
spdxExtractedText{"%%%Notice License%%%"},
@@ -618,7 +618,7 @@
spdxVersion{},
spdxDataLicense{},
spdxDocumentName{"Android"},
- spdxID{"Android"},
+ spdxID{},
spdxDocumentNameSpace{},
spdxCreatorOrganization{},
spdxCreatedTime{},
@@ -627,7 +627,7 @@
spdxPkgID{"testdata/reciprocal/highest.apex.meta_lic"},
spdxPkgDownloadLocation{"NOASSERTION"},
spdxPkgLicenseDeclared{"testdata-firstparty-FIRST_PARTY_LICENSE"},
- spdxRelationship{"DOCUMENT-Android ", "testdata/reciprocal/highest.apex.meta_lic", "DESCRIBES"},
+ spdxRelationship{"DOCUMENT ", "testdata/reciprocal/highest.apex.meta_lic", "DESCRIBES"},
packageTag{"testdata/reciprocal/bin/bin1.meta_lic"},
packageName{"testdata/reciprocal/bin/bin1.meta_lic"},
spdxPkgID{"testdata/reciprocal/bin/bin1.meta_lic"},
@@ -698,7 +698,7 @@
spdxVersion{},
spdxDataLicense{},
spdxDocumentName{"Android"},
- spdxID{"Android"},
+ spdxID{},
spdxDocumentNameSpace{},
spdxCreatorOrganization{},
spdxCreatedTime{},
@@ -707,7 +707,7 @@
spdxPkgID{"testdata/reciprocal/container.zip.meta_lic"},
spdxPkgDownloadLocation{"NOASSERTION"},
spdxPkgLicenseDeclared{"testdata-firstparty-FIRST_PARTY_LICENSE"},
- spdxRelationship{"DOCUMENT-Android ", "testdata/reciprocal/container.zip.meta_lic", "DESCRIBES"},
+ spdxRelationship{"DOCUMENT ", "testdata/reciprocal/container.zip.meta_lic", "DESCRIBES"},
packageTag{"testdata/reciprocal/bin/bin1.meta_lic"},
packageName{"testdata/reciprocal/bin/bin1.meta_lic"},
spdxPkgID{"testdata/reciprocal/bin/bin1.meta_lic"},
@@ -778,7 +778,7 @@
spdxVersion{},
spdxDataLicense{},
spdxDocumentName{"Android"},
- spdxID{"Android"},
+ spdxID{},
spdxDocumentNameSpace{},
spdxCreatorOrganization{},
spdxCreatedTime{},
@@ -787,7 +787,7 @@
spdxPkgID{"testdata/reciprocal/application.meta_lic"},
spdxPkgDownloadLocation{"NOASSERTION"},
spdxPkgLicenseDeclared{"testdata-firstparty-FIRST_PARTY_LICENSE"},
- spdxRelationship{"DOCUMENT-Android ", "testdata/reciprocal/application.meta_lic", "DESCRIBES"},
+ spdxRelationship{"DOCUMENT ", "testdata/reciprocal/application.meta_lic", "DESCRIBES"},
packageTag{"testdata/reciprocal/bin/bin3.meta_lic"},
packageName{"testdata/reciprocal/bin/bin3.meta_lic"},
spdxPkgID{"testdata/reciprocal/bin/bin3.meta_lic"},
@@ -835,7 +835,7 @@
spdxVersion{},
spdxDataLicense{},
spdxDocumentName{"Android"},
- spdxID{"Android"},
+ spdxID{},
spdxDocumentNameSpace{},
spdxCreatorOrganization{},
spdxCreatedTime{},
@@ -844,7 +844,7 @@
spdxPkgID{"testdata/reciprocal/bin/bin1.meta_lic"},
spdxPkgDownloadLocation{"NOASSERTION"},
spdxPkgLicenseDeclared{"testdata-firstparty-FIRST_PARTY_LICENSE"},
- spdxRelationship{"DOCUMENT-Android ", "testdata/reciprocal/bin/bin1.meta_lic", "DESCRIBES"},
+ spdxRelationship{"DOCUMENT ", "testdata/reciprocal/bin/bin1.meta_lic", "DESCRIBES"},
packageTag{"testdata/reciprocal/lib/liba.so.meta_lic"},
packageName{"testdata/reciprocal/lib/liba.so.meta_lic"},
spdxPkgID{"testdata/reciprocal/lib/liba.so.meta_lic"},
@@ -881,7 +881,7 @@
spdxVersion{},
spdxDataLicense{},
spdxDocumentName{"Android"},
- spdxID{"Android"},
+ spdxID{},
spdxDocumentNameSpace{},
spdxCreatorOrganization{},
spdxCreatedTime{},
@@ -890,7 +890,7 @@
spdxPkgID{"testdata/reciprocal/lib/libd.so.meta_lic"},
spdxPkgDownloadLocation{"NOASSERTION"},
spdxPkgLicenseDeclared{"testdata-notice-NOTICE_LICENSE"},
- spdxRelationship{"DOCUMENT-Android ", "testdata/reciprocal/lib/libd.so.meta_lic", "DESCRIBES"},
+ spdxRelationship{"DOCUMENT ", "testdata/reciprocal/lib/libd.so.meta_lic", "DESCRIBES"},
spdxLicense{},
spdxLicenseID{"testdata-notice-NOTICE_LICENSE"},
spdxExtractedText{"%%%Notice License%%%"},
@@ -910,7 +910,7 @@
spdxVersion{},
spdxDataLicense{},
spdxDocumentName{"Android"},
- spdxID{"Android"},
+ spdxID{},
spdxDocumentNameSpace{},
spdxCreatorOrganization{},
spdxCreatedTime{},
@@ -919,7 +919,7 @@
spdxPkgID{"testdata/restricted/highest.apex.meta_lic"},
spdxPkgDownloadLocation{"NOASSERTION"},
spdxPkgLicenseDeclared{"testdata-firstparty-FIRST_PARTY_LICENSE"},
- spdxRelationship{"DOCUMENT-Android ", "testdata/restricted/highest.apex.meta_lic", "DESCRIBES"},
+ spdxRelationship{"DOCUMENT ", "testdata/restricted/highest.apex.meta_lic", "DESCRIBES"},
packageTag{"testdata/restricted/bin/bin1.meta_lic"},
packageName{"testdata/restricted/bin/bin1.meta_lic"},
spdxPkgID{"testdata/restricted/bin/bin1.meta_lic"},
@@ -995,7 +995,7 @@
spdxVersion{},
spdxDataLicense{},
spdxDocumentName{"Android"},
- spdxID{"Android"},
+ spdxID{},
spdxDocumentNameSpace{},
spdxCreatorOrganization{},
spdxCreatedTime{},
@@ -1004,7 +1004,7 @@
spdxPkgID{"testdata/restricted/container.zip.meta_lic"},
spdxPkgDownloadLocation{"NOASSERTION"},
spdxPkgLicenseDeclared{"testdata-firstparty-FIRST_PARTY_LICENSE"},
- spdxRelationship{"DOCUMENT-Android ", "testdata/restricted/container.zip.meta_lic", "DESCRIBES"},
+ spdxRelationship{"DOCUMENT ", "testdata/restricted/container.zip.meta_lic", "DESCRIBES"},
packageTag{"testdata/restricted/bin/bin1.meta_lic"},
packageName{"testdata/restricted/bin/bin1.meta_lic"},
spdxPkgID{"testdata/restricted/bin/bin1.meta_lic"},
@@ -1079,7 +1079,7 @@
spdxVersion{},
spdxDataLicense{},
spdxDocumentName{"Android"},
- spdxID{"Android"},
+ spdxID{},
spdxDocumentNameSpace{},
spdxCreatorOrganization{},
spdxCreatedTime{},
@@ -1088,7 +1088,7 @@
spdxPkgID{"testdata/restricted/bin/bin1.meta_lic"},
spdxPkgDownloadLocation{"NOASSERTION"},
spdxPkgLicenseDeclared{"testdata-firstparty-FIRST_PARTY_LICENSE"},
- spdxRelationship{"DOCUMENT-Android ", "testdata/restricted/bin/bin1.meta_lic", "DESCRIBES"},
+ spdxRelationship{"DOCUMENT ", "testdata/restricted/bin/bin1.meta_lic", "DESCRIBES"},
packageTag{"testdata/restricted/lib/liba.so.meta_lic"},
packageName{"testdata/restricted/lib/liba.so.meta_lic"},
spdxPkgID{"testdata/restricted/lib/liba.so.meta_lic"},
@@ -1129,7 +1129,7 @@
spdxVersion{},
spdxDataLicense{},
spdxDocumentName{"Android"},
- spdxID{"Android"},
+ spdxID{},
spdxDocumentNameSpace{},
spdxCreatorOrganization{},
spdxCreatedTime{},
@@ -1138,7 +1138,7 @@
spdxPkgID{"testdata/restricted/lib/libd.so.meta_lic"},
spdxPkgDownloadLocation{"NOASSERTION"},
spdxPkgLicenseDeclared{"testdata-notice-NOTICE_LICENSE"},
- spdxRelationship{"DOCUMENT-Android ", "testdata/restricted/lib/libd.so.meta_lic", "DESCRIBES"},
+ spdxRelationship{"DOCUMENT ", "testdata/restricted/lib/libd.so.meta_lic", "DESCRIBES"},
spdxLicense{},
spdxLicenseID{"testdata-notice-NOTICE_LICENSE"},
spdxExtractedText{"%%%Notice License%%%"},
@@ -1157,7 +1157,7 @@
spdxVersion{},
spdxDataLicense{},
spdxDocumentName{"Android"},
- spdxID{"Android"},
+ spdxID{},
spdxDocumentNameSpace{},
spdxCreatorOrganization{},
spdxCreatedTime{},
@@ -1166,7 +1166,7 @@
spdxPkgID{"testdata/proprietary/highest.apex.meta_lic"},
spdxPkgDownloadLocation{"NOASSERTION"},
spdxPkgLicenseDeclared{"testdata-firstparty-FIRST_PARTY_LICENSE"},
- spdxRelationship{"DOCUMENT-Android ", "testdata/proprietary/highest.apex.meta_lic", "DESCRIBES"},
+ spdxRelationship{"DOCUMENT ", "testdata/proprietary/highest.apex.meta_lic", "DESCRIBES"},
packageTag{"testdata/proprietary/bin/bin1.meta_lic"},
packageName{"testdata/proprietary/bin/bin1.meta_lic"},
spdxPkgID{"testdata/proprietary/bin/bin1.meta_lic"},
@@ -1241,7 +1241,7 @@
spdxVersion{},
spdxDataLicense{},
spdxDocumentName{"Android"},
- spdxID{"Android"},
+ spdxID{},
spdxDocumentNameSpace{},
spdxCreatorOrganization{},
spdxCreatedTime{},
@@ -1250,7 +1250,7 @@
spdxPkgID{"testdata/proprietary/container.zip.meta_lic"},
spdxPkgDownloadLocation{"NOASSERTION"},
spdxPkgLicenseDeclared{"testdata-firstparty-FIRST_PARTY_LICENSE"},
- spdxRelationship{"DOCUMENT-Android ", "testdata/proprietary/container.zip.meta_lic", "DESCRIBES"},
+ spdxRelationship{"DOCUMENT ", "testdata/proprietary/container.zip.meta_lic", "DESCRIBES"},
packageTag{"testdata/proprietary/bin/bin1.meta_lic"},
packageName{"testdata/proprietary/bin/bin1.meta_lic"},
spdxPkgID{"testdata/proprietary/bin/bin1.meta_lic"},
@@ -1325,7 +1325,7 @@
spdxVersion{},
spdxDataLicense{},
spdxDocumentName{"Android"},
- spdxID{"Android"},
+ spdxID{},
spdxDocumentNameSpace{},
spdxCreatorOrganization{},
spdxCreatedTime{},
@@ -1334,7 +1334,7 @@
spdxPkgID{"testdata/proprietary/application.meta_lic"},
spdxPkgDownloadLocation{"NOASSERTION"},
spdxPkgLicenseDeclared{"testdata-firstparty-FIRST_PARTY_LICENSE"},
- spdxRelationship{"DOCUMENT-Android ", "testdata/proprietary/application.meta_lic", "DESCRIBES"},
+ spdxRelationship{"DOCUMENT ", "testdata/proprietary/application.meta_lic", "DESCRIBES"},
packageTag{"testdata/proprietary/bin/bin3.meta_lic"},
packageName{"testdata/proprietary/bin/bin3.meta_lic"},
spdxPkgID{"testdata/proprietary/bin/bin3.meta_lic"},
@@ -1382,7 +1382,7 @@
spdxVersion{},
spdxDataLicense{},
spdxDocumentName{"Android"},
- spdxID{"Android"},
+ spdxID{},
spdxDocumentNameSpace{},
spdxCreatorOrganization{},
spdxCreatedTime{},
@@ -1391,7 +1391,7 @@
spdxPkgID{"testdata/proprietary/bin/bin1.meta_lic"},
spdxPkgDownloadLocation{"NOASSERTION"},
spdxPkgLicenseDeclared{"testdata-firstparty-FIRST_PARTY_LICENSE"},
- spdxRelationship{"DOCUMENT-Android ", "testdata/proprietary/bin/bin1.meta_lic", "DESCRIBES"},
+ spdxRelationship{"DOCUMENT ", "testdata/proprietary/bin/bin1.meta_lic", "DESCRIBES"},
packageTag{"testdata/proprietary/lib/liba.so.meta_lic"},
packageName{"testdata/proprietary/lib/liba.so.meta_lic"},
spdxPkgID{"testdata/proprietary/lib/liba.so.meta_lic"},
@@ -1428,7 +1428,7 @@
spdxVersion{},
spdxDataLicense{},
spdxDocumentName{"Android"},
- spdxID{"Android"},
+ spdxID{},
spdxDocumentNameSpace{},
spdxCreatorOrganization{},
spdxCreatedTime{},
@@ -1437,7 +1437,7 @@
spdxPkgID{"testdata/proprietary/lib/libd.so.meta_lic"},
spdxPkgDownloadLocation{"NOASSERTION"},
spdxPkgLicenseDeclared{"testdata-notice-NOTICE_LICENSE"},
- spdxRelationship{"DOCUMENT-Android ", "testdata/proprietary/lib/libd.so.meta_lic", "DESCRIBES"},
+ spdxRelationship{"DOCUMENT ", "testdata/proprietary/lib/libd.so.meta_lic", "DESCRIBES"},
spdxLicense{},
spdxLicenseID{"testdata-notice-NOTICE_LICENSE"},
spdxExtractedText{"%%%Notice License%%%"},
@@ -1541,20 +1541,14 @@
return "PackageName: " + replaceSlashes(m.name)
}
-type spdxID struct {
- name string
-}
+type spdxID struct {}
func (m spdxID) isMatch(line string) bool {
- groups := spdxIDTag.FindStringSubmatch(line)
- if len(groups) != 2 {
- return false
- }
- return groups[1] == replaceSlashes(m.name)
+ return spdxIDTag.MatchString(line)
}
func (m spdxID) String() string {
- return "SPDXID: SPDXRef-DOCUMENT-" + replaceSlashes(m.name)
+ return "SPDXID: SPDXRef-DOCUMENT"
}
type spdxPkgID struct {
@@ -1590,7 +1584,7 @@
}
func (m spdxDataLicense) String() string {
- return "DataLicense: CC-1.0"
+ return "DataLicense: CC0-1.0"
}
type spdxDocumentName struct {
diff --git a/tools/releasetools/check_target_files_vintf.py b/tools/releasetools/check_target_files_vintf.py
index a254cab..5b71c72 100755
--- a/tools/releasetools/check_target_files_vintf.py
+++ b/tools/releasetools/check_target_files_vintf.py
@@ -237,7 +237,7 @@
if OPTIONS.search_path:
debugfs_path = os.path.join(OPTIONS.search_path, 'bin', 'debugfs_static')
deapexer_path = os.path.join(OPTIONS.search_path, 'bin', 'deapexer')
- blkid_path = os.path.join(OPTIONS.search_path, 'bin', 'blkid')
+ blkid_path = os.path.join(OPTIONS.search_path, 'bin', 'blkid_static')
fsckerofs_path = os.path.join(OPTIONS.search_path, 'bin', 'fsck.erofs')
if os.path.isfile(deapexer_path):
deapexer = deapexer_path
diff --git a/tools/releasetools/non_ab_ota.py b/tools/releasetools/non_ab_ota.py
index ac85aa4..7078d67 100644
--- a/tools/releasetools/non_ab_ota.py
+++ b/tools/releasetools/non_ab_ota.py
@@ -48,17 +48,12 @@
# if the filesystem is ext4.
partition_source_info = source_info["fstab"]["/" + name]
check_first_block = partition_source_info.fs_type == "ext4"
- # Disable using imgdiff for squashfs. 'imgdiff -z' expects input files to be
- # in zip formats. However with squashfs, a) all files are compressed in LZ4;
- # b) the blocks listed in block map may not contain all the bytes for a
- # given file (because they're rounded to be 4K-aligned).
- partition_target_info = target_info["fstab"]["/" + name]
- disable_imgdiff = (partition_source_info.fs_type == "squashfs" or
- partition_target_info.fs_type == "squashfs")
+ # Disable imgdiff because it relies on zlib to produce stable output
+ # across different versions, which is often not the case.
return common.BlockDifference(name, partition_tgt, partition_src,
check_first_block,
version=blockimgdiff_version,
- disable_imgdiff=disable_imgdiff)
+ disable_imgdiff=True)
if source_zip:
# See notes in common.GetUserImage()
@@ -282,7 +277,7 @@
needed_property_files = (
NonAbOtaPropertyFiles(),
)
- FinalizeMetadata(metadata, staging_file, output_file, needed_property_files)
+ FinalizeMetadata(metadata, staging_file, output_file, needed_property_files, package_key=OPTIONS.package_key)
def WriteBlockIncrementalOTAPackage(target_zip, source_zip, output_file):
@@ -409,7 +404,7 @@
if updating_boot:
boot_type, boot_device_expr = common.GetTypeAndDeviceExpr("/boot",
source_info)
- d = common.Difference(target_boot, source_boot)
+ d = common.Difference(target_boot, source_boot, "bsdiff")
_, _, d = d.ComputePatch()
if d is None:
include_full_boot = True
@@ -537,7 +532,7 @@
needed_property_files = (
NonAbOtaPropertyFiles(),
)
- FinalizeMetadata(metadata, staging_file, output_file, needed_property_files)
+ FinalizeMetadata(metadata, staging_file, output_file, needed_property_files, package_key=OPTIONS.package_key)
def GenerateNonAbOtaPackage(target_file, output_file, source_file=None):
diff --git a/tools/releasetools/ota_utils.py b/tools/releasetools/ota_utils.py
index e36a2be..e2ce31d 100644
--- a/tools/releasetools/ota_utils.py
+++ b/tools/releasetools/ota_utils.py
@@ -132,8 +132,10 @@
# Re-sign the package after updating the metadata entry.
if no_signing:
+ logger.info(f"Signing disabled for output file {output_file}")
shutil.copy(prelim_signing, output_file)
else:
+ logger.info(f"Signing the output file {output_file} with key {package_key}")
SignOutput(prelim_signing, output_file, package_key, pw)
# Reopen the final signed zip to double check the streaming metadata.