commit 5ec7b56e5d3143329f9a5d77630be54924dee2a5
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jan 10 14:39:53 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 10 14:39:53 2020 +0000
tree 9b6633e26a7217ca1cb33d88ef25f8bdf360f497
parent b4484dc33bea149b5a271ad9f2bc1bd27ebbc126
parent 38dc09d39a815558eed9d9ae88b1ce3caa65461f

Merge "Use our prebuilt M4 for flex and bison"

target/product/base_system.mk

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 2895801..8ced9ab 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -323,7 +323,7 @@
     telephony-common \
     voip-common \
     ims-common \
-    framework-sdkext \
+    framework-sdkextensions \
     ike \
     updatable-media \
     framework-tethering
@@ -332,7 +332,7 @@
     com.android.conscrypt:conscrypt \
     com.android.ipsec:ike \
     com.android.media:updatable-media \
-    com.android.sdkext:framework-sdkext \
+    com.android.sdkext:framework-sdkextensions \
     com.android.tethering:framework-tethering
 
 PRODUCT_COPY_FILES += \

target/product/sdk_phone_x86.mk

diff --git a/target/product/sdk_phone_x86.mk b/target/product/sdk_phone_x86.mk
index 4f7602d..9df26a9 100644
--- a/target/product/sdk_phone_x86.mk
+++ b/target/product/sdk_phone_x86.mk
@@ -15,7 +15,6 @@
 #
 QEMU_USE_SYSTEM_EXT_PARTITIONS := true
 PRODUCT_USE_DYNAMIC_PARTITIONS := true
-BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --flags 2
 
 #
 # All components inherited here go to system image

tools/releasetools/common.py

diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py
index b0a0e02..6a6f119 100644
--- a/tools/releasetools/common.py
+++ b/tools/releasetools/common.py
@@ -62,7 +62,7 @@
           'Warning: releasetools script should be invoked as hermetic Python '
           'executable -- build and run `{}` directly.'.format(script_name[:-3]),
           file=sys.stderr)
-    self.search_path = os.path.realpath(os.path.join(exec_path, '..'))
+    self.search_path = os.path.realpath(os.path.join(os.path.dirname(exec_path), '..'))
 
     self.signapk_path = "framework/signapk.jar"  # Relative to search_path
     self.signapk_shared_library_path = "lib64"   # Relative to search_path

tools/releasetools/sign_target_files_apks.py

diff --git a/tools/releasetools/sign_target_files_apks.py b/tools/releasetools/sign_target_files_apks.py
index 35b11c1..fffbace 100755
--- a/tools/releasetools/sign_target_files_apks.py
+++ b/tools/releasetools/sign_target_files_apks.py
@@ -552,8 +552,13 @@
 
     # Ask add_img_to_target_files to rebuild the recovery patch if needed.
     elif filename in ("SYSTEM/recovery-from-boot.p",
+                      "VENDOR/recovery-from-boot.p",
+
                       "SYSTEM/etc/recovery.img",
-                      "SYSTEM/bin/install-recovery.sh"):
+                      "VENDOR/etc/recovery.img",
+
+                      "SYSTEM/bin/install-recovery.sh",
+                      "VENDOR/bin/install-recovery.sh"):
       OPTIONS.rebuild_recovery = True
 
     # Don't copy OTA certs if we're replacing them.