Commit Graph

412 Commits

Author SHA1 Message Date
Dan Willemsen
17df46e334 Add Android.bp-based definitions for host sdk-repos
So that these can be built independently from the large sdk zip. The old
Make-based implementation created this as part of the large sdk zip,
then extracted it from that zip file.

This topic only adds the new definitions under a different filename,
full replacement will come in a follow-on CL.

Once we fully transitions to this mechanism, we'll be able to turn down
most modules on Macs, only building these and their dependencies.

Bug: 187222815
Change-Id: If6be8dd573a323ef8b343bc86116ffa3d43922a5
2021-10-12 20:45:15 -07:00
Anton Hansson
48c492ed9f Add sdk extension version info to prop templates
This adds two new properties alongside AndroidVersion.ApiLevel:
- AndroidVersion.ExtensionLevel: The sdk extension version if the SDK
- AndroidVersion.IsBaseSdk: Whether the extension level is the the one
  that the ApiLevel shipped with (true), or if is an extension SDK
  release (false).

While we're here, dedupe the recipe that processes these templates.

Bug: 195281582
Test: m out/host/linux-x86/development/sdk/platform_source.properties
      and inspect the substitution is working
Change-Id: Ieea20731aed2e0f35bbe4cfd8ca596cf11f4b3bc
Merged-In: Ieea20731aed2e0f35bbe4cfd8ca596cf11f4b3bc
(cherry picked from commit cf2f42c36b7997e9ce87682bb3a5511bdb72936f)
2021-08-31 17:42:12 +00:00
Josh Gao
8b610b2723 Merge "Increment platform-tools version to 31.0.3." am: 65fea01166 am: ff486c36a2
Original change: https://android-review.googlesource.com/c/platform/development/+/1745375

Change-Id: I2ff1a2c88c1c2dc4d5285664e6c5597d20737f44
2021-06-24 04:20:55 +00:00
Josh Gao
464de6e2d5 Increment platform-tools version to 31.0.3.
Test: none
Change-Id: Ibafcc438450b0a1f56fdc34366ef078d989899a0
2021-06-23 17:06:45 -07:00
Raju Kulkarni
783a29a1b2 Bump version number for Beta3. Since this is Finalized SDK we reset the values to next API level
Test: N/A
Bug: b/190226779
Change-Id: Iab4ace0a5036d58afee463acc161126786bc53da
2021-06-04 23:12:50 +00:00
Søren Gjesse
a901356832 Merge "Remove DX from the SDK" am: a5b6f93ff2 am: a2c173be97 am: 0b05fe7f8f
Original change: https://android-review.googlesource.com/c/platform/development/+/1681270

Change-Id: I3d0b57e94b7c88dca24be52a94cd8c0ba93a0243
2021-04-21 10:51:50 +00:00
Søren Gjesse
005a6f340f 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
Test: m win_sdk
Bug: 185479734
Bug: 73711890

Change-Id: I2fdbab7ce7ab50a637baf523ae5c2e87ab01fb8c
2021-04-20 16:55:43 +00:00
Neha Jain
10cbdd49a3 Update release config and emulator files for Android S(API 31) Beta2
Bug: 185861247
Change-Id: I0cbf325041c9b7618378390c4d87beea9daecf78
2021-04-20 06:19:29 +00:00
Neha Jain
9d57a6cea6 Update release config and emulator files for Android S(API 31) Beta1
Bug: 185838357
Change-Id: I5a0f0aa1f49b8bd6e6a85462283bb2f7f3ad7776
2021-04-20 00:39:39 +00:00
Søren Gjesse
a560627ab3 Merge "Revert "Remove DX from the SDK"" am: 4e005d8a1c am: 783a0df53e am: 08412579dd
Original change: https://android-review.googlesource.com/c/platform/development/+/1679488

Change-Id: I8e5940a3297dbae3a61c91c341a02b2aca9e0ead
2021-04-19 15:48:39 +00:00
Søren Gjesse
5d721b12cd Merge "Remove DX from the SDK" am: 5064ab0df2 am: bc3752e0aa am: 03aecca430
Original change: https://android-review.googlesource.com/c/platform/development/+/1677226

Change-Id: I409cfd6133c038ca14578a64428062a2ce4d2309
2021-04-19 14:53:51 +00:00
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
Treehugger Robot
24b8e8f996 Merge "Bump platform-tools version number" am: f3a4f3f966 am: 585e33ba5c am: 94af362628
Original change: https://android-review.googlesource.com/c/platform/development/+/1647232

Change-Id: I9fd9da6346462808e44314d7153a3878ac44a85c
2021-03-20 09:02:15 +00:00
Raju Kulkarni
d05c21bfd3 Bump platform-tools version number
Bug: 183233790
Test: N/A
Change-Id: Ib24c3b593102fb6c5b4f76cb6d9b106778fe8b95
2021-03-19 22:42:00 +00:00
Neha Jain
c2dc037dad Update release config and emulator files for Android S(API 31) DP3
Bug: 183043978
Change-Id: Ic1003c0b596653b629bd1e23bf2c58a19b1f0056
2021-03-19 20:35:35 +00:00
Josh Gao
0fd2a4e13e Merge "Increment platform-tools version to 31.0.1." am: c3043eaa4b am: 1d215a4530 am: 959148b45e
Original change: https://android-review.googlesource.com/c/platform/development/+/1612365

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I23662d1bd42ec98ce0ccac8662624e63cd4e2b23
2021-03-03 02:21:27 +00:00
Josh Gao
e0a2abb78e Increment platform-tools version to 31.0.1.
Test: none
Change-Id: Ie76bb225a859cd5cc99ac48b73ce68650e168d0d
2021-03-01 23:18:01 -08:00
Neha Jain
1a11af7686 Update release config and emulator files for Android S(API 31) DP2
Bug: 180273604
Change-Id: I3f75b638598cd9ee3d9ae2224b1c43e492416a8e
2021-02-16 08:21:02 +00:00
Treehugger Robot
73272bf578 Merge "[LSC] Add LOCAL_LICENSE_KINDS to development" am: d6b1cbf769 am: 4d108c6ffe am: 483ddf28c8
Original change: https://android-review.googlesource.com/c/platform/development/+/1589100

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8bfb99db5af219de8b7c6844b99006009152bbe8
2021-02-16 01:02:14 +00:00
Bob Badour
f7cf305656 [LSC] Add LOCAL_LICENSE_KINDS to development
Added SPDX-license-identifier-Apache-2.0 to:
  apps/BluetoothDebug/Android.bp
  apps/BuildWidget/Android.bp
  apps/CustomLocale/Android.bp
  apps/DevelopmentSettings/Android.bp
  apps/Fallback/Android.bp
  apps/GestureBuilder/Android.bp
  apps/NinePatchLab/Android.bp
  apps/OBJViewer/Android.bp
  apps/PushApiAuthenticator/Android.bp
  apps/PushApiTestAppOne/Android.bp
  apps/PushApiTestAppTwo/Android.bp
  apps/SdkSetup/Android.bp
  apps/SettingInjectorSample/Android.bp
  apps/WidgetPreview/Android.bp
  apps/launchperf/Android.bp
  cmds/monkey/Android.mk
  gsi/gsi_util/Android.bp
  gsi/repack_super_image/Android.bp
  host/windows/Android.bp
  python-packages/Android.bp
  samples/AccelerometerPlay/Android.bp
  samples/AdaptiveIconSample/Android.bp
  samples/AliasActivity/Android.bp
  samples/AndroidBeamDemo/Android.bp
  samples/AppNavigation/Android.bp
  samples/AutofillKeyboard/Android.bp
  samples/BackupRestore/Android.bp
  samples/BasicGLSurfaceView/Android.bp
  samples/BluetoothChat/Android.bp
  samples/BrokenKeyDerivation/Android.bp
  samples/BrokenKeyDerivation/tests/Android.bp
  samples/BusinessCard/Android.bp
  samples/Compass/Android.bp
  samples/ContactManager/Android.bp
  samples/CubeLiveWallpaper/Android.bp
  samples/DataWiper/Android.bp
  samples/DeviceAdminWhitelistedAccount/Android.bp
  samples/FixedGridLayout/Android.bp
  samples/HeavyWeight/Android.bp
  samples/HelloActivity/Android.bp
  samples/HelloActivity/tests/Android.bp
  samples/HelloEffects/Android.bp
  samples/Home/Android.bp
  samples/HoneycombGallery/Android.bp
  samples/InlineFillService/Android.bp
  samples/JetBoy/Android.bp
  samples/LceDemo/Android.bp
  samples/LunarLander/Android.bp
  samples/LunarLander/tests/Android.bp
  samples/MultiResolution/Android.bp
  samples/MultiWindow/Android.bp
  samples/MySampleRss/Android.bp
  samples/NotePad/Android.bp
  samples/Obb/Android.bp
  samples/RSSReader/Android.bp
  samples/ReceiveShareDemo/Android.bp
  samples/SampleSyncAdapter/Android.bp
  samples/SimpleJNI/Android.bp
  samples/SimpleJNI/jni/Android.bp
  samples/SipDemo/Android.bp
  samples/SkeletonApp/Android.bp
  samples/SkeletonApp/tests/Android.bp
  samples/Snake/Android.bp
  samples/Snake/tests/Android.bp
  samples/SoftKeyboard/Android.bp
  samples/SpellChecker/HelloSpellChecker/Android.bp
  samples/SpellChecker/SampleSpellCheckerService/Android.bp
  samples/StackWidget/Android.bp
  samples/ThemedNavBarKeyboard/Android.bp
  samples/ToyVpn/Android.bp
  samples/TtsEngine/Android.bp
  samples/USB/AdbTest/Android.bp
  samples/USB/MissileLauncher/Android.bp
  samples/UiAutomator/Android.mk
  samples/Vault/Android.bp
  samples/Vault/tests/Android.bp
  samples/VoiceRecognitionService/Android.bp
  samples/VoicemailProviderDemo/Android.bp
  samples/WeatherListWidget/Android.bp
  samples/WiFiDirectDemo/Android.bp
  samples/WiFiDirectServiceDiscovery/Android.bp
  samples/Wiktionary/Android.bp
  samples/WiktionarySimple/Android.bp
  samples/XmlAdapters/Android.bp
  samples/apkcachetest/Android.bp
  samples/training/NsdChat/Android.bp
  scripts/Android.bp
  testrunner/Android.mk
  testrunner/tests/Android_native.mk
  tools/apkcheck/Android.bp
  tools/bugreport/Android.bp
  tools/etc1tool/Android.bp
  tools/idegen/Android.bp
  tools/mkstubs/Android.bp
  tools/rmtypedefs/Android.bp
  vndk/Android.bp
  vndk/tools/Android.bp
  vndk/tools/elfcheck/Android.bp
  vndk/tools/header-checker/Android.bp
  vndk/tools/header-checker/src/repr/protobuf/proto/Android.bp
  vndk/tools/header-checker/tests/integration/ifunc/Android.bp
  vndk/tools/header-checker/tests/integration/version_script_example/Android.bp
  vndk/tools/image-diff-tool/Android.bp

Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
    SPDX-license-identifier-CPL-1.0 SPDX-license-identifier-MIT
    SPDX-license-identifier-Unicode-DFS SPDX-license-identifier-W3C
    legacy_restricted legacy_unencumbered
to:
  Android.bp

Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-CPL-1.0
to:
  samples/SearchableDictionary/Android.bp

Added SPDX-license-identifier-Apache-2.0 legacy_unencumbered
to:
  tools/Android.bp

Added SPDX-license-identifier-BSD SPDX-license-identifier-CPL-1.0
    SPDX-license-identifier-MIT SPDX-license-identifier-Unicode-DFS
    SPDX-license-identifier-W3C
to:
  sdk/Android.bp

Added legacy_restricted
to:
  samples/KeyChainDemo/Android.bp
  tools/line_endings/Android.bp
  vndk/tools/definition-tool/datasets/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: I9847e00fb4278bc083b4debbc751003c995ea45c
2021-02-12 17:13:45 -08:00
Josh Gao
8367ed81d0 Merge "Increment platform-tools version to 31.0.0." am: cfacb78776 am: 58c5cdc32a am: 2987b19664
Original change: https://android-review.googlesource.com/c/platform/development/+/1564416

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic827e9dc6ccb2c0c0e4583fe99af87c5999d9fa4
2021-01-29 23:10:31 +00:00
Josh Gao
2dc5c8aa70 Increment platform-tools version to 31.0.0.
Test: none
Change-Id: Icc76da55bb0808f0059f8d462040e7f1109a33b6
2021-01-28 15:47:16 -08:00
Neha Jain
77ef6f2f14 Bump version number for SDK, Build tools and emulator images for Android S preview1, updating arm props as well
Bug: 177075973
Change-Id: Id7cf372d8e22e48492fc04c4ae5b0ff92bc8497c
2021-01-11 18:08:48 +00:00
Xin Li
2324b78a22 DO NOT MERGE - Merge RQ1A.201205.011
Bug: 172690556
Merged-In: I025c0d96e77b7355baddac935779c6b27f3042e3
Change-Id: I22fee72738abe8efa77c138e1f85d6c08e8310d5
2020-12-07 00:39:38 -08:00
Neha Jain
32aada6f9f Updating build-tools package revision number to ship a hot fix for b/169193089
Bug: 169193089
Change-Id: I025c0d96e77b7355baddac935779c6b27f3042e3
Test: N/A
(cherry picked from commit 81daa26558)
2020-11-04 04:00:41 +00:00
Neha Jain
3cc69bc73e Updating build-tools package revision number to ship a hot fix for b/169193089 am: 81daa26558 am: 5ba9c06be9
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/12968794

Change-Id: Ia71e335f7c300832034b613e1a4337abfe560784
2020-11-02 23:03:18 +00:00
Neha Jain
81daa26558 Updating build-tools package revision number to ship a hot fix for b/169193089
Bug: 169193089
Change-Id: I025c0d96e77b7355baddac935779c6b27f3042e3
Test: N/A
2020-11-02 19:58:24 +00:00
Xin Li
fb486680d5 Merge ab/6749736 in stage.
Bug: 167233921
Merged-In: Ib2b2aad76699226b54a0ea9b98dacdea1527363d
Change-Id: I8d3e3c35a7c8d268b916c01eb5f2e065cbb5bf24
2020-10-08 22:57:45 -07:00
Xin Li
85103c3ebd Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master 2020-09-01 20:01:28 +00:00
Josh Gao
4ab01796c3 Merge "Increment platform-tools version to 30.0.5." am: 68d61b793d am: 7145314ecc
Original change: https://android-review.googlesource.com/c/platform/development/+/1414053

Change-Id: I65782185be027afbb3c1c46739033ba036cb3dd3
2020-08-27 23:52:19 +00:00
Josh Gao
af86588ebb Increment platform-tools version to 30.0.5.
Test: none
Change-Id: I596cfd21d4c7915b33b69e93f6c6a3f3befd543c
2020-08-27 15:47:16 -07:00
TreeHugger Robot
1af67c4232 Merge "Bumping SDK Platform package version number for SDK re-release to include Automotive jars Bug: 162442020 Change-Id: I7a0a750e92d70130764a8d3fb098e48d44190cf0 Test: N/A" into rvc-dev am: 12d17ed89e am: fa16127ad6
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/12284131

Change-Id: Iebbef505cc617cd47a39d2b4baf66397915d7b08
2020-07-31 20:14:52 +00:00
Raju Kulkarni
8432340294 Updating build-tools package revision number to ship a hot fix for b/162522383 am: 2d94bec03a am: 188b062824
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/12284259

Change-Id: Ifa7fcf32a34c8265dd6dbbeae6e67348649f6d64
2020-07-31 20:14:48 +00:00
TreeHugger Robot
1cce5f0fd7 Merge "Bumping SDK Platform package version number for SDK re-release to include Automotive jars Bug: 162442020 Change-Id: I7a0a750e92d70130764a8d3fb098e48d44190cf0 Test: N/A" into rvc-dev am: 12d17ed89e
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/12284131

Change-Id: I06fa5d0fbd44513f4df4083f93eb5d1febd0a44d
2020-07-31 19:55:05 +00:00
Raju Kulkarni
98940ff84d Updating build-tools package revision number to ship a hot fix for b/162522383 am: 2d94bec03a
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/12284259

Change-Id: I479384f8901a803ad2e0cbd4d0915a6016bbfa33
2020-07-31 19:54:57 +00:00
TreeHugger Robot
12d17ed89e Merge "Bumping SDK Platform package version number for SDK re-release to include Automotive jars Bug: 162442020 Change-Id: I7a0a750e92d70130764a8d3fb098e48d44190cf0 Test: N/A" into rvc-dev 2020-07-31 19:41:25 +00:00
Raju Kulkarni
56aa106e16 Bumping SDK Platform package version number for SDK re-release to include Automotive jars
Bug: 162442020
Change-Id: I7a0a750e92d70130764a8d3fb098e48d44190cf0
Test: N/A
2020-07-31 18:27:46 +00:00
Raju Kulkarni
2d94bec03a Updating build-tools package revision number to ship a hot fix for b/162522383
Bug: 162522383
Test: N/A

Change-Id: I4a467a0e9dd1817838d4aaf8cebf88903f826275
2020-07-31 18:17:10 +00:00
Josh Gao
005253a131 Merge "Increment platform-tools version to 30.0.4." am: f942ac7893 am: 0ab3cd7dc6
Original change: https://android-review.googlesource.com/c/platform/development/+/1356983

Change-Id: I3e618e31c70a854c202240c176c617302f76f94f
2020-07-07 23:55:58 +00:00
Josh Gao
8c7fd846de Increment platform-tools version to 30.0.4.
Test: none
Change-Id: I679256b71ddf6e059dd6025f3bf74e51e7bfaebf
2020-07-07 16:26:48 -07:00
Josh Gao
57a734c09a Merge "Increment platform-tools version to 30.0.3." am: 762b997814 am: ed286ecb7e
Original change: https://android-review.googlesource.com/c/platform/development/+/1326085

Change-Id: Iaf96ca0dbbda238815f14a837c50782545968291
2020-06-09 10:27:59 +00:00
Josh Gao
8687cb4ee9 Increment platform-tools version to 30.0.3.
Test: none
Change-Id: Ice0865dd036c8fbb73d65aded21c5a67531995b0
2020-06-09 02:55:30 -07:00
Raju Kulkarni
f54d3338d2 Bumping SDK and build tools version number for Beta2 am: 7cbc5035b9
Change-Id: I809ecb4a0f3f27000329090a892691a240b5a8d1
2020-05-30 03:31:00 +00:00
Raju Kulkarni
7cbc5035b9 Bumping SDK and build tools version number for Beta2
Bug: 157771440
Test: N/A
Change-Id: I86f99b37c4ec53d06945425d4091f52b23906d8f
2020-05-29 22:19:44 +00:00
Josh Gao
f51653a372 Merge "Increment platform-tools version to 30.0.2." am: 59e343d977 am: 2f6ed8c049
Change-Id: I5cea6c329396386f2b92198a8267bbf0b6a38005
2020-05-27 21:02:26 +00:00
Josh Gao
dde337043b Increment platform-tools version to 30.0.2.
Test: none
Change-Id: I480f133824c556ed622fe96371a1fca27cf90d2d
2020-05-27 13:21:29 -07:00
Raju Kulkarni
ab8e4655dd Updating platform SDK version for R
* Reset package versions
  * Update VNDK lib list

Bug:152953870

Test: N/A

Change-Id: I765b1467af5a7a32a48e0d78a29486f320266577
Merged-In: I765b1467af5a7a32a48e0d78a29486f320266577
2020-05-03 09:47:21 -07:00
Raju Kulkarni
fd29ac8a5e Updating platform SDK version for R
* Reset package versions
  * Update VNDK lib list

Bug:152953870

Test: N/A

Exempt-From-Owner-Approval: merge conflict resolution

Change-Id: I765b1467af5a7a32a48e0d78a29486f320266577
Merged-In: I765b1467af5a7a32a48e0d78a29486f320266577
2020-05-02 14:38:47 -07:00
Josh Gao
9b1e69ee2e Merge "Increment platform-tools version to 30.0.1." am: 0879b4757c am: 5cc3c95c3b
Change-Id: I6f0bb5c28968167fab9441f22c0bf73542697baa
2020-04-27 21:04:44 +00:00