From 0d1967598533d77996ff363d9eeea35914f72410 Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Wed, 15 Dec 2021 17:53:48 +0800 Subject: [PATCH 1/2] Update SVN to 21 for O6R4 Feb MPR 2022 Bug: 208388283 Change-Id: Ibed22f512bb16e2166b81a783a707d0018aa88a3 --- device-oriole.mk | 2 +- device-raven.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index b807dd6..e7f7fe8 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -144,7 +144,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=20 + ro.vendor.build.svn=21 # Hide cutout overlays PRODUCT_PACKAGES += \ diff --git a/device-raven.mk b/device-raven.mk index 40b4126..8b74d73 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -145,7 +145,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=20 + ro.vendor.build.svn=21 # Hide cutout overlays PRODUCT_PACKAGES += \ From 13a1e928ec3fdf56f83cfb6f4807b6fea26f8102 Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Tue, 21 Dec 2021 11:44:31 -0800 Subject: [PATCH 2/2] Inline usages of LOCAL_STEM Having no variables in include/inherit-product statements makes the conversion to starlark cleaner. Bug: 211659921 Test: Presubmits Change-Id: I70bdaced349694b2e76c7fe8e500876a56e1efaf --- self-extractors_oriole/root/proprietary/BoardConfigVendor.mk | 4 +--- self-extractors_oriole/root/proprietary/device-vendor.mk | 4 +--- self-extractors_raven/root/proprietary/BoardConfigVendor.mk | 4 +--- self-extractors_raven/root/proprietary/device-vendor.mk | 4 +--- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/self-extractors_oriole/root/proprietary/BoardConfigVendor.mk b/self-extractors_oriole/root/proprietary/BoardConfigVendor.mk index fa00b92..a632ec4 100644 --- a/self-extractors_oriole/root/proprietary/BoardConfigVendor.mk +++ b/self-extractors_oriole/root/proprietary/BoardConfigVendor.mk @@ -12,6 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -LOCAL_STEM := oriole/BoardConfigPartial.mk - --include vendor/google_devices/$(LOCAL_STEM) +-include vendor/google_devices/oriole/BoardConfigPartial.mk diff --git a/self-extractors_oriole/root/proprietary/device-vendor.mk b/self-extractors_oriole/root/proprietary/device-vendor.mk index aa3ae50..30e512a 100644 --- a/self-extractors_oriole/root/proprietary/device-vendor.mk +++ b/self-extractors_oriole/root/proprietary/device-vendor.mk @@ -12,6 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -LOCAL_STEM := oriole/device-partial.mk - -$(call inherit-product-if-exists, vendor/google_devices/$(LOCAL_STEM)) +$(call inherit-product-if-exists, vendor/google_devices/oriole/device-partial.mk) diff --git a/self-extractors_raven/root/proprietary/BoardConfigVendor.mk b/self-extractors_raven/root/proprietary/BoardConfigVendor.mk index 25a880e..6e788fc 100644 --- a/self-extractors_raven/root/proprietary/BoardConfigVendor.mk +++ b/self-extractors_raven/root/proprietary/BoardConfigVendor.mk @@ -12,6 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -LOCAL_STEM := raven/BoardConfigPartial.mk - --include vendor/google_devices/$(LOCAL_STEM) +-include vendor/google_devices/raven/BoardConfigPartial.mk diff --git a/self-extractors_raven/root/proprietary/device-vendor.mk b/self-extractors_raven/root/proprietary/device-vendor.mk index 4877f39..2be1993 100644 --- a/self-extractors_raven/root/proprietary/device-vendor.mk +++ b/self-extractors_raven/root/proprietary/device-vendor.mk @@ -12,6 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -LOCAL_STEM := raven/device-partial.mk - -$(call inherit-product-if-exists, vendor/google_devices/$(LOCAL_STEM)) +$(call inherit-product-if-exists, vendor/google_devices/raven/device-partial.mk)