Commit Graph

672 Commits

Author SHA1 Message Date
Aurimas Liutikas
3219aad274 Move to framework-doc-stubs module for versions xml and annotations
api-versions.xml and annotations.zip will now be taken from framework-doc-stubs
module so that api-stubs-docs can stop generating them.

Test: lunch sdk; make sdk
Bug: 151160048
Change-Id: I35fdba553318098a09249f47d7d78cdef79f3898
Merged-in: I35fdba553318098a09249f47d7d78cdef79f3898
2020-03-23 18:53:17 +00:00
Jerome Gaillard
233f53ec93 Merge "Some files for the SDK are now built in a different place" am: 2e9d2a0112 am: 085de0e20f am: 11d3bb7fb7
am: 59faa1bf7f

Change-Id: I35d164715d2ac3bdd1fce13efed805abfe661cce
2019-10-21 05:14:28 -07:00
Jerome Gaillard
52633e91d1 Some files for the SDK are now built in a different place
This updates the origin location of some files because they are now
generated in a different way and so end up in a different folder.

Bug: 142480924
Test: m sdk
Change-Id: I2dafafc113e7e5c77d469b69b7fe9f25cc0555b1
2019-10-17 13:55:53 +01:00
Jerome Gaillard
995f03c2ca Do not ship layoutlib in the SDK
Layoutlib and all the necessary resources have shipped in Android Studio
for some time, so it is not necessary to have them included in the SDK.

Bug: 142046954
Test: N/A
Change-Id: Ic1192fee7296a1e29f0d314fe299f0e105c93c45
2019-10-03 14:37:08 +01:00
Joshua Gilpatrick
8b36def7bd Remove fastdeploy agent files
These files are now embeded into the binary and pushed as needed.
Test: None
Bug: 138130943
Change-Id: Icda72bf674ceb8ab7971110723af3458881b4618
2019-07-29 10:06:00 -07:00
bohu
6bceabf81d emulator: support dynamic partition
BUG: 125540538

Change-Id: I68895c39c4f48f53077a4e766718c63b1d1da91a
Merged-In: I68895c39c4f48f53077a4e766718c63b1d1da91a
2019-05-02 15:40:54 -07:00
Colin Cross
76aa9e1b65 Package framework.aidl produced by Soong
Bug: 130798034
Test: forrest
Change-Id: Ie5606eeace783b09e822b7045880f57f7fb8dab1
2019-04-18 12:10:41 -07:00
Xin Li
56d3f25f4f DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master
Bug: 124234733
Change-Id: I390b8d0f71cea3b74ff9e6e6cb7b9156f6072b0b
2019-02-12 09:53:25 -08:00
Jack He
595d42ffff Fix SDK build as BluetoothHDP is removed
Bug: 111562841
Test: make
Change-Id: I1b21e8a009634d1b865cf100c4a172435566bdd1
2019-01-09 22:26:41 -08:00
Nan Zhang
2fcbc4e364 Bundle Metalava based api-versions.xml to SDK
Since Metalava has the ability to generate api-versions.xml, so just
remove the old ones, and ship the new file to SDK.

Test: m -j
out/target/common/obj/PACKAGING/api-stubs-docs_generated-api-versions.xml
Bug: b/78245848

Change-Id: I007fd17b6e0f069f0d9dd9eac192f5e915be5f7a
2018-09-18 12:44:36 -07:00
Miao Wang
b0a428fd03 Update SDK atree to include librsjni_androidx
Bug: 111948805
Bug: 113119760

Test: mm
Change-Id: Ic8f16145102eb23b958d53ce845cc0a85a775365
(cherry picked from commit 43cb00cedf)
2018-09-14 23:54:24 +00:00
Idries Hamadi
d8b7f7c118 Merge "Added sdk copy parameters for fastdeploy files"
am: c4f747b082

Change-Id: Id8aeedc3b3420367e7383f708656e6be0523644e
2018-09-06 08:40:09 -07:00
Idries Hamadi
d51c3233c3 Added sdk copy parameters for fastdeploy files
Test: make sdk -j44
Change-Id: Iff381b95c2a111f8463421b01a0da20ffc7843e3
2018-09-06 08:20:47 +01:00
Nicole Borrelli
a3bb3b5f27 Merge "Remove deprecated media sample."
am: 8f7bfcff2b

Change-Id: I8efd773a12d2b948613b2e624d7be92c3a80f607
2018-08-21 10:30:32 -07:00
Nicole Borrelli
ce3abea5df Remove deprecated media sample.
For a cononical sample of a media player, see the Universal Music Player:
https://github.com/googlesamples/android-UniversalMusicPlayer

Bug: 33676939
Test: Verified projects compile when code removed.

Change-Id: I56e09ccf85647296c29da9a06b03b0fae98d50e6
2018-08-20 10:26:07 -07:00
Nan Zhang
60ca2642f7 Merge "Remove Metalava related targets in development."
am: 1594b2db03

Change-Id: I089002ebf676f03b68b3cca82e7151f3e9b43a09
2018-08-17 11:53:59 -07:00
Nan Zhang
18babf6827 Remove Metalava related targets in development.
Since api-stubs-docs have been deleted and replaced by Metalava.

Test: m -j checkbuild
Bug: b/70351683 b/78245848
Change-Id: I6dc8b8f903f77699b90cd5e28c55f74c14a20b54
Merged-In: I6dc8b8f903f77699b90cd5e28c55f74c14a20b54
2018-08-07 16:07:33 -07:00
Nan Zhang
a5c2c0a2a7 Merge "Copy files related to sdk dev tool(activity_actions.txt, and etc.) from offline-sdk" into stage-aosp-master
am: d4447a131e

Change-Id: Ie35bb4aeb0b71b8fc3bd86a9708d1afa6c80d0b1
2018-07-31 15:27:24 -07:00
Nan Zhang
e5f330b940 Copy files related to sdk dev tool(activity_actions.txt, and etc.) from
offline-sdk

Originally these files were dumped to out/target/common/docs. However,
three modules(offline-sdk, offline-sdk-referenceonly, and
offline-system-sdk-referenceonly) generate these files with the same
name which might cause the problem that these files got overwritten back
and forth.

Test: m -j out/target/common/docs/offline-sdk-timestamp
Bug: b/70351683
Change-Id: Ia433796a0152bc9efacf656d06efc2a328a756a1
Merged-In: Ia433796a0152bc9efacf656d06efc2a328a756a1
2018-07-31 12:24:58 -07:00
Nan Zhang
bb08277dd1 Merge "Revert "Copy files related to sdk dev tool(activity_actions.txt, and etc.) from"" am: 57112d3318
am: a6b087b37b

Change-Id: I39c2c49e0302a7970a5fa26b7032af12acf35eb8
2018-07-30 14:27:49 -07:00
Nan Zhang
a6b087b37b Merge "Revert "Copy files related to sdk dev tool(activity_actions.txt, and etc.) from""
am: 57112d3318

Change-Id: I702f87920ab463a9b1dbcc7575de8af8e9e3c45f
2018-07-30 14:23:44 -07:00
Nan Zhang
18e28bdbee Revert "Copy files related to sdk dev tool(activity_actions.txt, and etc.) from"
This reverts commit a3aeb54513.

Reason for revert: <This CL broke the target: aosp-master/sdk>

Change-Id: I991b696afdbaf6fb2998758b91076768e476b1ed
2018-07-30 21:07:17 +00:00
Nan Zhang
e820794186 Merge "Copy files related to sdk dev tool(activity_actions.txt, and etc.) from offline-sdk" am: a574d1c922
am: 2c300ea015

Change-Id: I61b2ab356cf8ad51d275b91fb421cd8d8159a8c4
2018-07-30 13:54:55 -07:00
Nan Zhang
2c300ea015 Merge "Copy files related to sdk dev tool(activity_actions.txt, and etc.) from offline-sdk"
am: a574d1c922

Change-Id: I2370f0bc1f6e8a837b1a6b72be9703d3b31cab48
2018-07-30 13:41:44 -07:00
Nan Zhang
a3aeb54513 Copy files related to sdk dev tool(activity_actions.txt, and etc.) from
offline-sdk

Originally these files were dumped to out/target/common/docs. However,
three modules(offline-sdk, offline-sdk-referenceonly, and
offline-system-sdk-referenceonly) generate these files with the same
name which might cause the problem that these files got overwritten back
and forth.

Test: m -j out/target/common/docs/offline-sdk-timestamp
Bug: b/70351683
Change-Id: I9badab5243f0d2a14bd55e561661483365b677c2
Merged-In: I9badab5243f0d2a14bd55e561661483365b677c2
2018-07-26 16:08:35 -07:00
Mads Ager
1c875445b6 Update version of D8 in buildtools to latest stable version (1.0.35)
The version used to build the platform at a given point in time
might not be the best to use for external developers. Sometimes
bugs in old VMs have to be worked around in D8. Those bugs do
not affect the platform build, but could affect other users.
Therefore, we use separate versions for building the platform
and for shipping in buildtools.

Additionally, make sure that the licenses for libraries shipped
with D8 are reflected in the buildtools NOTICE file.

Test: make -j PRODUCT-sdk_phone_armv7-win_sdk sdk_repo
Test: make -j PRODUCT-sdk_arm64-sdk sdk_repo
Bug: 111748733

(cherry picked from commit 0dec39ec21)

Change-Id: I0ca07e45647ea95816f5e96e991673ee24ed9983
Merged-In: I0ca07e45647ea95816f5e96e991673ee24ed9983
2018-07-25 10:43:33 +02:00
Mads Ager
307267f363 Merge "Update version of D8 in buildtools to latest stable version (1.0.35)" am: bb0e2b1a6f
am: 37be299ada

Change-Id: Ib3a048ad1606c0b05a242bd9322220bd988e7fad
2018-07-25 00:25:38 -07:00
Mads Ager
37be299ada Merge "Update version of D8 in buildtools to latest stable version (1.0.35)"
am: bb0e2b1a6f

Change-Id: I4bbbb66f833ed1536c78bbd6364341c756ff6d0a
2018-07-25 00:21:55 -07:00
Mads Ager
bb0e2b1a6f Merge "Update version of D8 in buildtools to latest stable version (1.0.35)" 2018-07-25 07:11:54 +00:00
Nan Zhang
82347efc97 Merge "Use android.jar from Metalava." am: e973f6de0f
am: 7ef23e5e55

Change-Id: I4860b044393936972fb922d02d7fdb1c61925ff7
2018-07-24 17:15:50 -07:00
Nan Zhang
7ef23e5e55 Merge "Use android.jar from Metalava."
am: e973f6de0f

Change-Id: I6ad90d2a1d87f99932760f41dc61dd5d4ba56be4
2018-07-24 17:06:36 -07:00
Mads Ager
0dec39ec21 Update version of D8 in buildtools to latest stable version (1.0.35)
The version used to build the platform at a given point in time
might not be the best to use for external developers. Sometimes
bugs in old VMs have to be worked around in D8. Those bugs do
not affect the platform build, but could affect other users.
Therefore, we use separate versions for building the platform
and for shipping in buildtools.

Additionally, make sure that the licenses for libraries shipped
with D8 are reflected in the buildtools NOTICE file.

Test: make -j PRODUCT-sdk_phone_armv7-win_sdk sdk_repo
Test: make -j PRODUCT-sdk_arm64-sdk sdk_repo
Bug: 111748733

Change-Id: I0ca07e45647ea95816f5e96e991673ee24ed9983
2018-07-24 06:55:59 +00:00
Miao Wang
bdd3c784f6 Merge "Update SDK tree after androidx.renderscript file name change." into pi-dev
am: bd9634bab5

Change-Id: I7810593b1ddfbcfd4384ef3ca49e6a74b1d08c80
2018-07-19 18:58:51 -07:00
TreeHugger Robot
bd9634bab5 Merge "Update SDK tree after androidx.renderscript file name change." into pi-dev 2018-07-19 21:43:41 +00:00
Miao Wang
c1885b13d8 Update SDK tree after androidx.renderscript file name change.
- androidx.renderscript prebuilt is named as androidx-rs.
  - android.support.v8.renderscript prebuilt is still renderscript-v8.
  - Note, this ONLY impact SDK and not device images.

Bug: 74398526
Test: mm
Change-Id: Ibdd547d4ce5ccb02394c2ce708561b1f13c8e16a
(cherry picked from commit ff268369ee)
2018-07-19 19:52:39 +00:00
Tor Norbye
58ab9ef051 Use android.jar from Metalava.
This CL only affects the SDK.

It reverts commit 91967398ad
and then updates the packaging source for android.jar to
the metalava jar.

It also packages the extracted annotations, annotations.zip.

Test: Manually built various apps with android.jar file
  as well as some binary verification with javap
Bug: 78245848

Change-Id: I5614a7f5af11d12c99cf0275ae0a88d97cc0bbc7
(cherry-picked from f13bb3dab6)
2018-06-26 13:22:46 -07:00
Weilun Du
b64626604c Copy dummy userdata.img to sdk system images
am: 62fff1d2d7

Change-Id: I3f97801ac923771d76eb2d5976adb8f4bc02933a
2018-06-21 17:40:43 -07:00
Weilun Du
62fff1d2d7 Copy dummy userdata.img to sdk system images
Avd manager in Android Studio requires userdata.img in the downloaded
system image. As we no longer inlcude the real userdata.img, we copy the
dummy userdata.img to pass the check.
This cl does not impact real devices.

BUG: 110492064

Change-Id: Ia8377ce72e32c3556a5a27100085a07f43d9917c
Signed-off-by: Weilun Du <wdu@google.com>
2018-06-21 14:14:12 -07:00
Tor Norbye
f13bb3dab6 Use android.jar from Metalava.
This CL only affects the SDK.

It reverts commit 91967398ad
and then updates the packaging source for android.jar to
the metalava jar.

It also packages the extracted annotations, annotations.zip.

Test: Manually built various apps with android.jar file
  as well as some binary verification with javap
Bug: 78245848

Change-Id: I5614a7f5af11d12c99cf0275ae0a88d97cc0bbc7
Merged-In: I5180bc18979415cec6255beb3fe2c48ec298d3ae
2018-06-14 17:52:26 +00:00
Weilun Du
3faa84edb5 Merge "Package /data instead of userdata.img in sdk images" into pi-dev
am: fb6997e6a2

Change-Id: I0c6bf23bd8a57180b9f1a7cc7472ecf8f3b8d988
2018-05-31 23:22:41 -07:00
TreeHugger Robot
fb6997e6a2 Merge "Package /data instead of userdata.img in sdk images" into pi-dev 2018-06-01 05:01:50 +00:00
Weilun Du
963d2e05e6 Package /data instead of userdata.img in sdk images
userdata.img becomes 4GB in P and it doesn't work well with patcher in
android studio. We decided to remove userdata.img in system image zip
and generate userdata.img from /data by emulator.
Within the /data folder, we only keep /misc for the emulated WiFi.
This cl does not impact real devices.

BUG: 79925096

Change-Id: Ida3f2163cab30b38cd02a0280b5fd7abd9a66945
Signed-off-by: Weilun Du <wdu@google.com>
2018-05-30 09:33:13 -07:00
Ivan Gavrilovic
d8602da2a9 Add d8 to build tools
BUG: 74015795
Test: make -j PRODUCT-sdk_phone_armv7-win_sdk showcommands sdk_repo
Test: make -j PRODUCT-sdk_arm64-sdk showcommands sdk_repo
(cherry picked from commit e05b47b6ea)

Change-Id: I2efb3004f89c4ad9874efce3b33de0132dd6e445
Merged-In: I2efb3004f89c4ad9874efce3b33de0132dd6e445
2018-05-24 09:55:15 +01:00
Jiyong Park
3ae7694f41 Stubs lib for org.apache.http.legacy is changed to -.stubs.
Stubs lib for the sdk library org.apache.http.legacy is renamed to
org.apache.http.legacy.stubs, because the lib is now built using the
standardized build script 'java_sdk_library' where stubs libs are
suffixed with .stubs.

Bug: 77577799
Test: m -j
Merged-In: I5f45410472b0e4003d2d3cda4c9c72af8d6b4919
Change-Id: I5f45410472b0e4003d2d3cda4c9c72af8d6b4919
(cherry picked from commit 5579c00e56)
2018-05-22 20:42:10 +09:00
Jiyong Park
d06181a427 Stubs lib for org.apache.http.legacy is changed to -.stubs.
Stubs lib for the sdk library org.apache.http.legacy is renamed to
org.apache.http.legacy.stubs, because the lib is now built using the
standardized build script 'java_sdk_library' where stubs libs are
suffixed with .stubs.

Bug: 77577799
Test: m -j
Merged-In: I5f45410472b0e4003d2d3cda4c9c72af8d6b4919
Change-Id: I5f45410472b0e4003d2d3cda4c9c72af8d6b4919
(cherry picked from commit 5579c00e56)
2018-05-22 20:15:32 +09:00
Ivan Gavrilovic
9c4edf9ab3 Merge "Add d8 to build tools" am: 5e56071da1
am: a473af1733

Change-Id: I7d6fd32bb17c27247356ebc517db3142b9b7c650
2018-05-17 06:41:19 -07:00
Ivan Gavrilovic
e05b47b6ea Add d8 to build tools
BUG: 74015795
Test: make -j PRODUCT-sdk_phone_armv7-win_sdk showcommands sdk_repo
Test: make -j PRODUCT-sdk_arm64-sdk showcommands sdk_repo
2018-05-17 12:54:38 +00:00
Jiyong Park
c84e69622a javalib.jar -> classes.jar for the stubs included in SDK
I6730e2d3ec38004874265b2a690442dec57b33f4 made it clear that we should
depend on classes.jar for static java libraries. However, due to the
existing references to javalib.jar, the build system has been copied
classes.jar to javalib.jar.

But, this is not the case for Soong-defined java libraries. Instead of
doing the same thing for Soong-defined modules, directly fixing the
case where javalib.jar is being referenced.

Test: m -j dist
Bug: b/70351683
Merged-In: Ib1fb4ebdbdde42dec1028160a5473c645913d258
Change-Id: Ib1fb4ebdbdde42dec1028160a5473c645913d258
(cherry-picked Ib1fb4ebdbdde42dec1028160a5473c645913d258)
2018-04-12 15:00:41 -07:00
Guang Zhu
e6106af3c9 delete tests baked into emulator system image
am: 1c3364c022

Change-Id: Iff3f525633e56b90e1eaff7a859a4ff95edd1940
2018-04-10 10:15:13 -07:00
Guang Zhu
1c3364c022 delete tests baked into emulator system image
- tests are out of maintainence
- the checks were general functional tests on comms related
  areas and should be covered by the same tests across physical
  and virtual devices

Bug: 77496099
Test: build `make -j droid tests dist`
Change-Id: I899764846b4829add5ade8085a43bf88c958914f
2018-04-09 20:21:40 -07:00