commit a89b70f3b5c79ad91788c1d09552888c3f4cff0c
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Dec 11 17:10:03 2019 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Dec 11 17:10:03 2019 +0000
tree bf381c7c47e8a4e9c2b9705975a1281644b10b09
parent 2f90e05834a5e7b1376544a45ab0da20203943ad
parent 9af25780cae86bd3e4a683ff20506e7db8cde9f1

Merge "Use ro.build.version.extensions.r" am: c410209ec3 am: 9af25780ca

Change-Id: I67e4d47d5b11adbae788e5892bdbec53a4f6e77b

apex/sdkext/derive_sdk/derive_sdk.cpp

diff --git a/apex/sdkext/derive_sdk/derive_sdk.cpp b/apex/sdkext/derive_sdk/derive_sdk.cpp
index 0aacebe..7536def 100644
--- a/apex/sdkext/derive_sdk/derive_sdk.cpp
+++ b/apex/sdkext/derive_sdk/derive_sdk.cpp
@@ -68,7 +68,7 @@
     auto itr = std::min_element(versions.begin(), versions.end());
     std::string prop_value = itr == versions.end() ? "0" : std::to_string(*itr);
 
-    if (!android::base::SetProperty("persist.com.android.sdkext.sdk_info", prop_value)) {
+    if (!android::base::SetProperty("ro.build.version.extensions.r", prop_value)) {
         LOG(ERROR) << "failed to set sdk_info prop";
         return EXIT_FAILURE;
     }

apex/sdkext/framework/java/android/os/ext/SdkExtensions.java

diff --git a/apex/sdkext/framework/java/android/os/ext/SdkExtensions.java b/apex/sdkext/framework/java/android/os/ext/SdkExtensions.java
index 331ef21..d3b9397 100644
--- a/apex/sdkext/framework/java/android/os/ext/SdkExtensions.java
+++ b/apex/sdkext/framework/java/android/os/ext/SdkExtensions.java
@@ -38,7 +38,7 @@
 
     private static final int R_EXTENSION_INT;
     static {
-        R_EXTENSION_INT = SystemProperties.getInt("persist.com.android.sdkext.sdk_info", 0);
+        R_EXTENSION_INT = SystemProperties.getInt("ro.build.version.extensions.r", 0);
     }
 
     /**