Merge "Migrate finalized prebuilts to the new directory structure." am: c39642cce4 am: 8ce2023d18
am: 54388cea8f
Change-Id: I80d8517dae0d0275733e969ec1358713069039db
diff --git a/api/28.txt b/api/28.txt
index 26e4298..d41372b 100644
--- a/api/28.txt
+++ b/api/28.txt
@@ -14187,13 +14187,11 @@
ctor public Picture();
ctor public Picture(android.graphics.Picture);
method public android.graphics.Canvas beginRecording(int, int);
- method public static deprecated android.graphics.Picture createFromStream(java.io.InputStream);
method public void draw(android.graphics.Canvas);
method public void endRecording();
method public int getHeight();
method public int getWidth();
method public boolean requiresHardwareAcceleration();
- method public deprecated void writeToStream(java.io.OutputStream);
}
public class PixelFormat {
diff --git a/current/definitions.mk b/current/definitions.mk
index fcef781..37ea394 100644
--- a/current/definitions.mk
+++ b/current/definitions.mk
@@ -122,3 +122,4 @@
android-support-v7-gridlayout
RESOLVE_SUPPORT_LIBRARIES := prebuilts/sdk/current/fix_dependencies.mk
+
diff --git a/update_prebuilts/update_prebuilts.py b/update_prebuilts/update_prebuilts.py
index 220d3d9..9c5171f 100755
--- a/update_prebuilts/update_prebuilts.py
+++ b/update_prebuilts/update_prebuilts.py
@@ -14,7 +14,7 @@
system_path = 'system_current'
api_path = 'api'
system_api_path = 'system-api'
-framework_sdk_target = 'sdk_mac'
+framework_sdk_target = 'sdk_phone_armv7-sdk_mac'
support_dir = os.path.join(current_path, 'support')
androidx_dir = os.path.join(current_path, 'androidx')
extras_dir = os.path.join(current_path, 'extras')
@@ -652,10 +652,14 @@
'core.current.stubs.jar': 'android.jar',
},
'public': {
+ 'android.test.base.stubs.jar': 'android.test.base.jar',
+ 'android.test.runner.stubs.jar': 'android.test.runner.jar',
+ 'android.test.mock.stubs.jar': 'android.test.mock.jar',
'org.apache.http.legacy.jar': 'org.apache.http.legacy.jar',
},
'system': {
'android_system.jar': 'android.jar',
+ 'android.test.mock.stubs_system.jar': 'android.test.mock.jar',
}
}
@@ -670,7 +674,9 @@
with zipfile.ZipFile(artifact_path) as zipFile:
paths = zipFile.namelist()
- filenames = ['android.jar', 'uiautomator.jar', 'framework.aidl']
+ filenames = ['android.jar', 'uiautomator.jar', 'framework.aidl',
+ 'optional/android.test.base.jar', 'optional/android.test.mock.jar',
+ 'optional/android.test.runner.jar']
for filename in filenames:
extract_to(zipFile, filename, current_path)
@@ -681,6 +687,7 @@
artifact_dict = {
'core.current.stubs.jar': path(current_path, 'core.jar'),
'android_system.jar': path(system_path, 'android.jar'),
+ 'android.test.mock.stubs_system.jar': path(system_path, 'optional/android.test.mock.jar'),
}
return fetch_artifacts(framework_sdk_target, build_id, artifact_dict)