diff options
| author | 2019-12-11 08:54:25 -0800 | |
|---|---|---|
| committer | 2019-12-11 08:54:25 -0800 | |
| commit | 9af25780cae86bd3e4a683ff20506e7db8cde9f1 (patch) | |
| tree | aad4e1ffd599bc5656a4613a3b279ac4f83a5c3f | |
| parent | 321a47ef3897305cb61cd5e79399b01ff9e99706 (diff) | |
| parent | c410209ec3b48b74097d980e532dd416e8431d40 (diff) | |
Merge "Use ro.build.version.extensions.r"
am: c410209ec3
Change-Id: I07eedd1a9ed07fa7b6dce9611651bf552f585dc3
| -rw-r--r-- | apex/sdkext/derive_sdk/derive_sdk.cpp | 2 | ||||
| -rw-r--r-- | apex/sdkext/framework/java/android/os/ext/SdkExtensions.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apex/sdkext/derive_sdk/derive_sdk.cpp b/apex/sdkext/derive_sdk/derive_sdk.cpp index 0aacebefaaca..7536def60767 100644 --- a/apex/sdkext/derive_sdk/derive_sdk.cpp +++ b/apex/sdkext/derive_sdk/derive_sdk.cpp @@ -68,7 +68,7 @@ int main(int, char**) { 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; } diff --git a/apex/sdkext/framework/java/android/os/ext/SdkExtensions.java b/apex/sdkext/framework/java/android/os/ext/SdkExtensions.java index 331ef21935bb..d3b9397d45f2 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 @@ public class SdkExtensions { 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); } /** |