Commit Graph

698 Commits

Author SHA1 Message Date
Søren Gjesse
a62cbeefdf Revert "Remove DX from the SDK"
This reverts commit 97c4f4304a.

Reason for revert: Build breakage

Change-Id: I24db691da0ff4bfdf95db611928084486183b3a7
2021-04-19 14:26:56 +00:00
Søren Gjesse
97c4f4304a Remove DX from the SDK
Deprecation and removal of support of DX was announced here:
https://android-developers.googleblog.com/2020/02/the-path-to-dx-deprecation.html.

There is says:

As of On Feb 1st, 2021, we’ll move to step 3, removing DX fully from
Android Studio and any other build environments.

Test: m sdk
Bug: 185479734
Bug: 73711890
Change-Id: I2d7601037ed4135e00cf48b4b9f490a86fec90cb
2021-04-19 13:39:03 +00:00
Steven Moreland
ed78a1f664 sdk.atree += libbinder_ndk C++ helpers
libbinder_ndk includes a set of C++ headers which are for all practical
purposes coupled with the AIDL compiler. Since NDK and SDK releases do
not line up, and some developers are known to use even old versions of
the SDK with the newest NDK, subtle C++ changes to this library may
break compatibility with the aidl compiler.

Both to reduce the possibility we accidentally break developers as well
as increase the types of changes that can be made, the plan is to always
ship libbinder_ndk C++ headers alongside AIDL.

In the future, this will come with a removal of these headers from the
NDK (with error messages pointing developers to use the version that is
built and tested with their version of aidl).

Bug: 160624671
Test: 'm sdk' and verify contents in out/host/*/sdk/sdk/**
Change-Id: I6dcdfce5314863663548f0a4523df6e96448ee23
2020-12-01 01:28:48 +00:00
Jaegeuk Kim
cb63b3059d Merge "support make_f2fs with casefoling support" am: 0548bafe93 am: b593fa77a1
Original change: https://android-review.googlesource.com/c/platform/development/+/1367738

Change-Id: Ic47ae06cc39a8e1d83b168fb67acc5d18f523b60
2020-08-04 05:10:19 +00:00
Zhomart Mukhamejanov
5b61ab6f97 Add generated Automotive OS SDK. am: bdb2a60d3e
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/12230897

Change-Id: Ibc767e65b6afdc4e9d8cad872ae9d6c36abf5551
2020-07-29 21:46:49 +00:00
Zhomart Mukhamejanov
bdb2a60d3e Add generated Automotive OS SDK.
- Update old comments in sdk.atree.
- Add README.md with instructions on building sdk.

Test: lunch sdk && m -j sdk
Test: Unzipped and extracted platforms/android-11/optional/android.car.jar
      and verified it with the latest android.car-stubs.jar from
      http://ab/.
Bug: 162442020
Change-Id: I9796fbcecfef5178915008b49d81cda996c66fa2
2020-07-29 20:31:17 +00:00
Zhomart Mukhamejanov
d18b3d9a78 Add Automotive OS API 29 stubs to platform SDK optionals. am: ecf644f2d6 am: 7737e3dc01 am: 683c5ffe37
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/12221485

Change-Id: I29ba637ead31f2466942c54fd26971d4fe8caed9
2020-07-24 21:07:16 +00:00
Zhomart Mukhamejanov
683c5ffe37 Add Automotive OS API 29 stubs to platform SDK optionals. am: ecf644f2d6 am: 7737e3dc01
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/12221485

Change-Id: I4aa6d0cc36fd61557d94a529b9a60f8e905101bb
2020-07-24 20:54:27 +00:00
Zhomart Mukhamejanov
ecf644f2d6 Add Automotive OS API 29 stubs to platform SDK optionals.
Android Automotive OS stubs (android.car-stubs.jar) is used
to compile apps against Car API.

NOTE: We tried using
${OUT_DIR}/target/common/obj/JAVA_LIBRARIES/android.car-stubs_intermediates/classes.jar,
but it doesn't work because car-stubs are not generated when building
regular Android SDK for phones.

Bug: 154653660
Test: m -j
Test: m -j dist
Test: 1. $ ./build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=sdk_phone_armv7 \
             TARGET_BUILD_VARIANT=userdebug win_sdk dist DIST_DIR=dist-mine sdk_repo
      2. Copy and unzip dist-mine/android-sdk_eng.zhomart_windows.zip to
         $HOME/Android/Sdk (replaced the existing Sdk forlder)
      3. Created a sample app, used "android.car.Car" and verified it
         compiles, runs and connects to the car service.
Change-Id: I1913fd89cf1cd702b3b5b3f386cf3693a5042eea
2020-07-23 22:24:13 +00:00
Jaegeuk Kim
111f87361b support make_f2fs with casefoling support
Bug: 159672232
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: Icfb28a534ebc71ee6575eaddd3c703fcd87cc127
2020-07-20 17:53:40 -07:00
Rico Wind
2a34fb7675 Merge "Revert back to using the default r8 jar for buildtools" am: d19b1fea66 am: 0885f568ce
Change-Id: I0a748f294daddcae894cbe7d9c490b633ed295d1
2020-05-13 10:12:15 +00:00
Rico Wind
34e933850f Revert back to using the default r8 jar for buildtools
We have never actually updated the buildtools version independently of
the normal updates (except updating it to be the same)

If we ever need to update it to a seperate version, that is is easily
accomplished by changing the path.

Bug: b/134507641
Test: m -j55 sdk and run d8 in the sdk zip validating the version
Change-Id: Ib1540b22921e10946ec33076f1db40c50bccac76
2020-05-13 08:45:55 +00:00
bohu
e3c06cb247 emulator: package ramdisk-qemu.img to image zip
BUG: 149826779
Test: build
Change-Id: I7949daa15edafeeb51e80d320bcbb5a450cd0a49
Merged-In: I7949daa15edafeeb51e80d320bcbb5a450cd0a49
2020-05-01 20:01:53 +00:00
Colin Cross
18b3f5f895 Package core-current-stubs-for-system-modules into the SDK
core-current-stubs-for-system-modules needs to be distributed
in the SDK to allow apps to be built with javac -source 9 -target 9.

Bug: 143209928
Test: m TARGET_PRODUCT=sdk_phone_x86 TARGET_BUILD_VARIANT=userdebug sdk sdk_repo dist
Change-Id: I9d67344f159f9482567323f27c5a8e4e060e1f1a
Merged-In: I9d67344f159f9482567323f27c5a8e4e060e1f1a
(cherry picked from commit 89c5517a28)
2020-04-22 08:59:03 -07:00
Colin Cross
dd5163124e Merge "Package core-current-stubs-for-system-modules into the SDK" am: 56d21f5ebb am: 73e25944a0
Change-Id: I6aeef43fe3e2a4e0a2e5a15fc54c1a600b2923e7
2020-04-21 23:11:35 +00:00
Colin Cross
89c5517a28 Package core-current-stubs-for-system-modules into the SDK
core-current-stubs-for-system-modules needs to be distributed
in the SDK to allow apps to be built with javac -source 9 -target 9.

Bug: 143209928
Test: m TARGET_PRODUCT=sdk_phone_x86 TARGET_BUILD_VARIANT=userdebug sdk sdk_repo dist
Change-Id: I9d67344f159f9482567323f27c5a8e4e060e1f1a
2020-04-17 18:18:18 -07:00
Bo Hu
31fb4ee26e Merge "emulator: package ramdisk-qemu.img to image zip" am: 62b3edb5ea am: 59578569d4
Change-Id: I5f30b663990c0e00b9d5f8fc4c66d47cda17c1d3
2020-04-06 19:52:16 +00:00
bohu
7b21036ee9 emulator: package ramdisk-qemu.img to image zip
BUG: 149826779
Test: build
Change-Id: I7949daa15edafeeb51e80d320bcbb5a450cd0a49
2020-04-06 14:05:54 +00:00
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
Automerger Merge Worker
ed90102744 Merge "Move to framework-doc-stubs module for versions xml and annotations" am: 73870d9f09 am: 50ba681dc1
Change-Id: I05450a7d309f32ee1ea92d795d31bf00c697e13f
2020-03-13 02:44:21 +00:00
Aurimas Liutikas
1a6d508576 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
Change-Id: I35fdba553318098a09249f47d7d78cdef79f3898
2020-03-12 16:26:06 -07:00
Jerome Gaillard
404f66903c 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
Merged-In: I2dafafc113e7e5c77d469b69b7fe9f25cc0555b1
2019-11-18 10:39:40 +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
edb348c7c2 emulator: disable system-on-root and kernelBlob support
BUG: 125540538

Change-Id: I68895c39c4f48f53077a4e766718c63b1d1da91a
Merged-In: I68895c39c4f48f53077a4e766718c63b1d1da91a
2019-05-03 03:37:21 +00: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
a248f4af4c Package framework.aidl produced by Soong
Bug: 130798034
Test: forrest
Change-Id: Ie5606eeace783b09e822b7045880f57f7fb8dab1
Merged-In: Ie5606eeace783b09e822b7045880f57f7fb8dab1
(cherry picked from commit 76aa9e1b65)
2019-04-22 09:58:10 -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
David Srbecky
237a371068 Merge "Fix SDK build as BluetoothHDP is removed" am: e3a587ee82
am: a7017b709c

Change-Id: I38fcd0bda4b1a173a25b15ce3e2f22993ea9770d
2019-01-10 05:49:12 -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
2d44d773eb Merge "Bundle Metalava based api-versions.xml to SDK" into stage-aosp-master
am: e205e2a934

Change-Id: I97d17153730b803225e8d3efb0367a6e9f9b450a
2018-09-18 17:54:01 -07: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
52916149c5 Update SDK atree to include librsjni_androidx
am: b0a428fd03

Change-Id: I0a8989593184a522d1a9cd7705e36fe046b6b8a0
2018-09-18 11:55:08 -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