| commit | 3b144695cd3ad8bbbc2f78291f3a9fccd0d9b231 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Oct 25 10:28:39 2019 -0700 |
| committer | Xin Li <delphij@google.com> | Fri Oct 25 10:28:39 2019 -0700 |
| tree | 940256e4982ab44ba37086a75fa4b150064f89dc | |
| parent | 601a9d61b85686833d49611d95af9376cb2d79b6 [diff] | |
| parent | 532485089d6036c152935465667050e736936c88 [diff] |
Merge Coral/Flame into AOSP master Bug: 141248619 Change-Id: I4cce9c29ba40927436d596cbdda0b15059e8df23 Merged-In: Ic4676321420e9b094ca38bfec548d3050dd3d1cc
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')