| commit | 03b8d42176e6fa43f8da3b6ee0f1e3bd53156d28 | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Tue Jul 16 09:28:58 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jul 16 09:28:58 2019 -0700 |
| tree | 6ddd80b1faddf752e71529714f5f3baacf37d1a1 | |
| parent | 5662c3ee2f0f9efeb29569cf176a0dfe2a16936a [diff] | |
| parent | 749bc1337163298be63dfaaa4ca663c02403f69e [diff] |
[automerger skipped] Merge "Import platform SDK from build 5716442" into qt-dev-plus-aosp am: 749bc13371 -s ours am skip reason: change_id Ib5a5745b05fd068e03ec6c874cb587b00d2a4b39 with SHA1 100f8aa394 is in history Change-Id: Icf2a9f2d85f20f6ba5601a46bec698b0f19971a2
diff --git a/current/public/android.jar b/current/public/android.jar index 5efb46e..fae8378 100644 --- a/current/public/android.jar +++ b/current/public/android.jar Binary files differ
diff --git a/current/system/android.jar b/current/system/android.jar index 890b043..0f99148 100644 --- a/current/system/android.jar +++ b/current/system/android.jar Binary files differ
diff --git a/current/test/android.jar b/current/test/android.jar index 2afe59b..45c536c 100644 --- a/current/test/android.jar +++ b/current/test/android.jar Binary files differ
diff --git a/update_prebuilts/update_prebuilts.py b/update_prebuilts/update_prebuilts.py index ca692d4..facad4a 100755 --- a/update_prebuilts/update_prebuilts.py +++ b/update_prebuilts/update_prebuilts.py
@@ -12,7 +12,7 @@ from functools import reduce current_path = 'current' -framework_sdk_target = 'sdk_phone_armv7-win_sdk' +framework_sdk_target = 'sdk_phone_armv7-sdk' support_dir = os.path.join(current_path, 'support') androidx_dir = os.path.join(current_path, 'androidx') extras_dir = os.path.join(current_path, 'extras')