7514 Commits

Author SHA1 Message Date
Colin Cross
d5b3d74850 Merge "Fix framworks/base compiling against musl" am: 2cba49ac56
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1828072

Change-Id: Icb43a2cb677d14772044cfe62e16e9cce5327f45
2021-09-17 02:02:58 +00:00
Colin Cross
7cdbd68610 Fix framworks/base compiling against musl
Add missing includes that are not transitively provided when compiling
against musl.

Bug: 190084016
Test: m USE_HOST_MUSL=true
Change-Id: Ia22c3df2e904e7a479bb636b7db22e5a0c341b98
2021-09-15 14:59:24 -07:00
Treehugger Robot
14c914335a Merge "Fix unused-but-set-variable warning" 2021-08-31 19:20:31 +00:00
Treehugger Robot
542c95130e Merge "Mention the tag to use to bypass the AOSP-first check." am: 7c25a55f5d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1814778

Change-Id: Iaa9997aafcf6058e83a3d9286ec2bd2015d2efbe
2021-08-31 19:03:39 +00:00
Treehugger Robot
7c25a55f5d Merge "Mention the tag to use to bypass the AOSP-first check." 2021-08-31 18:47:29 +00:00
Treehugger Robot
e29dc9dfe1 Merge "Stop using group_static_libs property" am: bc8a6d063b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1814336

Change-Id: Iae29e06901daae4b6f8d7f972ba938e2a94a5311
2021-08-31 18:07:45 +00:00
Yi Kong
e096481090 Fix unused-but-set-variable warning
Test: presubmit
Bug: 197240255
Change-Id: I5cca354746213e9ef43e848dbc38ecbe168d0b6a
2021-09-01 01:44:06 +08:00
Martin Stjernholm
f1ca127e8a Mention the tag to use to bypass the AOSP-first check.
Test: `repo upload` with a CL in system/unwinding in an internal branch
Change-Id: Ice32cbfbd12737771e5e7abcb590ed4d6b6da9b8
2021-08-31 16:52:15 +01:00
LaMont Jones
d010fb142d Stop using group_static_libs property
This property is now ignored, so there is no need to set it.
For more details, see the bug and/or "Effecient archive file handling"
in https://lld.llvm.org/NewLLD.html#key-concepts

Bug: 189475744
Test: Manual build succeeds
Change-Id: I79ff6aaba47fb13548d735b291da0796d416be48
2021-08-30 23:35:28 +00:00
Songchun Fan
54a4e7a360 Merge "[lint] add owners to frameworks/base/tools/lint" am: 5834070338
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1809160

Change-Id: Ie6e19ce58bb823ae259e80d1bb24347d9330c134
2021-08-27 00:32:38 +00:00
Songchun Fan
032e444c06 [lint] add owners to frameworks/base/tools/lint
BUG: 197635708
Test: none
Change-Id: I81c85fa751bac2d3dfb4076096b5dd0920edf3f3
2021-08-26 19:30:51 +00:00
Treehugger Robot
61555f903b Merge "Remove unused but set variables" am: 97fe4d0cc4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1802956

Change-Id: Iddb6fffb5f33f324859b5a6be0c6f1034cda3558
2021-08-19 23:16:57 +00:00
Yi Kong
82ac868c8c Remove unused but set variables
Discovered by unused-but-set-variable diagnostics.

Test: build
Bug: 197240255
Change-Id: I32a1185f9714848c91860fbaa76521d490c842b9
2021-08-19 18:57:56 +00:00
Colin Cross
1bb97985f0 Rename T to Tiramisu
PLATFORM_VERSION_CODENAME is being updated from T to Tiramisu.

Bug: 186121492
Bug: 194055070
Test: m checkbuild
Change-Id: I6882018a916dc1c71abc442068cb54fb9c42ff3c
Merged-In: I6882018a916dc1c71abc442068cb54fb9c42ff3c
(cherry picked from commit ff02f9a70ed9fa7cb3114f22db5290a316be661e)
2021-07-26 09:42:17 -07:00
Colin Cross
ff02f9a70e Rename T to Tiramisu
PLATFORM_VERSION_CODENAME is being updated from T to Tiramisu.

Bug: 186121492
Bug: 194055070
Test: m checkbuild
Change-Id: I6882018a916dc1c71abc442068cb54fb9c42ff3c
Merged-In: I6882018a916dc1c71abc442068cb54fb9c42ff3c
2021-07-23 21:06:15 +00:00
Brett Chabot
1c06cb829c Hopefully fix validatekeymaps mac build.
Only link in libbinder for linux builds.

Bug: 172023026
Test: m validatekeymaps
Change-Id: Ibdcdfab2c5160644b9b9453e56a76d47f6d2b9b4
Merged-In: Ibdcdfab2c5160644b9b9453e56a76d47f6d2b9b4
2021-06-30 17:25:59 -07:00
Kohsuke Yatoh
0a93841c46 Merge "Extract flag font from NotoColorEmoji" into sc-dev am: 80a8cf86c0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14970179

Change-Id: If11584176cfc18d8580dc021fabf6fb8445b1cdc
2021-06-29 00:56:10 +00:00
Sean McQuillan
9ed6166cb1 cherry-pick: Update fontchain_linter.py to be compatible with Compat font
Bug: 186700756
Test: m fontchain_lint

Merged-in: Ibfe33f29f3db998fdc0db1bbf35851841ca73d9a
Change-Id: Icfd3a8ee9e9bb4d877d721044a905ee7ecc6ed9a
2021-06-28 11:16:50 -07:00
Seigo Nonaka
458f1dd71c Extract flag font from NotoColorEmoji
Bug: 188926991
Bug: 188779144
Test: m fontchain_lint
Change-Id: Ie807e31abb407f5b58665d4d2941bc75186d5c42
Merged-In: Ie807e31abb407f5b58665d4d2941bc75186d5c42
2021-06-24 18:46:08 +00:00
Jeff Sharkey
80865170ce Merge "Emit "usesPermissionFlags" in "dump badging"." into sc-dev am: c206d63edc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14019347

Change-Id: I7e42cd52e8ba333dd00faa635767373d56adc30b
2021-06-04 22:20:08 +00:00
Jeff Sharkey
c206d63edc Merge "Emit "usesPermissionFlags" in "dump badging"." into sc-dev 2021-06-04 22:06:55 +00:00
Colin Cross
0df037d6ae Merge "Support codename T in aapt2" am: ff7bba27a8 am: 90b463900a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1715428

Change-Id: I6a9db68648a48c06bb0af370577b185d4cdcad04
2021-06-03 09:18:39 +00:00
Jeff Sharkey
b3a4448be3 Merge changes from topic "may27-sdk" into sc-dev am: e6fb6087aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14749815

Change-Id: I9ac77657a3bde896f7a90fa9879daf66f5f7a35a
2021-06-02 20:14:07 +00:00
Colin Cross
ff7bba27a8 Merge "Support codename T in aapt2" 2021-06-01 23:27:30 +00:00
Jeff Sharkey
de062e478c Finalize resource IDs; script to help in future.
Bug: 171506470
Test: Build
Change-Id: I7b7360475ff0f6f4d4c8b8872eefc4e80fd9640e
2021-06-01 06:48:52 -06:00
Jeff Sharkey
7c5f4337fd platform/frameworks/base/ - S is now 31
Bug: 171506470
Test: Build
Change-Id: I46d4df5f27783a96a58c966b113391ea3bc112cb
2021-06-01 06:48:51 -06:00
Jeff Sharkey
2a696f7a18 Merge changes from topic "may26-dab" into sc-dev am: 163db52409
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14738430

Change-Id: Idfbd586484a6fc76a2003456341932bfa8b6baaf
2021-05-26 21:14:30 +00:00
Jeff Sharkey
13bc791d51 Reintroduce "Deprecated at Birth" linter.
Earlier this year the "apilint.py" script was removed from the build,
since it's been replaced by Metalava.  However, several features
haven't been ported yet, so this change revives them to support the
SDK finalization process.

This change also updates the script to handle "Signature format: 2.0"
files, and reads the API surface from a directory which contains
several ".txt" files to support the new Mainline API structuring.

Bug: 189224267
Test: manual
Change-Id: Ifc4c24a7e159db6725897800d67947d1fd8b9880
2021-05-26 12:07:25 -06:00
Seth Moore
31c1300fe1 Merge "Check for Ignore-AOSP-First commit tag" into sc-dev am: a63e111574
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14703967

Change-Id: If7120daa47a8fd6d3b01afa2d7bae9826bf3b1ea
2021-05-26 16:27:41 +00:00
Seth Moore
f3d78421ba Check for Ignore-AOSP-First commit tag
If the Ignore-AOSP-First tag is in a commit message, it means the
committer is intentionally bypassing the AOSP source of truth. Check
for this tag in the AOSP-first presubmit hook so that devs don't have
to turn off hooks to get past the AOSP-first policy in exceptional
cases.

Bug: 189139990
Change-Id: I18231b93d7f213c13ace0a0af24bb20a394cc50f
Merged-In: I18231b93d7f213c13ace0a0af24bb20a394cc50f
Test: Manual testing with various commit messages
2021-05-26 09:17:27 -07:00
Seth Moore
a63e111574 Merge "Check for Ignore-AOSP-First commit tag" into sc-dev 2021-05-26 16:02:06 +00:00
Seth Moore
627b9ca3b7 Check for Ignore-AOSP-First commit tag
If the Ignore-AOSP-First tag is in a commit message, it means the
committer is intentionally bypassing the AOSP source of truth. Check
for this tag in the AOSP-first presubmit hook so that devs don't have
to turn off hooks to get past the AOSP-first policy in exceptional
cases.

Bug: 189139990
Change-Id: I18231b93d7f213c13ace0a0af24bb20a394cc50f
Test: Manual testing with various commit messages
2021-05-24 14:15:36 -07:00
Patrick Baumann
dff37ee6d2 Merge "Updates OWNERS files" into sc-dev 2021-05-24 18:30:19 +00:00
Patrick Baumann
43628ca24c Updates OWNERS files
Bug: 186864416
Test: Builds
Change-Id: I04dfc5c2c7143825334ebc62742e335b8c889492
2021-05-21 14:13:18 -07:00
Colin Cross
a1250b59ab Support codename T in aapt2
Bug: 186121492
Test: treehugger
Change-Id: I3f136f505bce80d0eb7f8b0cca316041730a4580
2021-05-21 10:23:17 -07:00
Ryan Mitchell
a73daaeb5c Merge "Do not call pop_back when app has no uses-sdk" into sc-dev am: 47e58f1238
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14664167

Change-Id: I05aad42f7077ee8f285e8df581608e872731834c
2021-05-20 23:37:22 +00:00
Ryan Mitchell
6ea9ed3d5f Do not call pop_back when app has no uses-sdk
Calling pop_back on an empty container results in undefined behavior.
aapt2 dump badging seg faults when used on an APK with no uses-sdk.

Bug: 188461703
Test: aapt2 dump badging HelloAppTest.apk
Change-Id: I8d8308a06d542f003ae399629bdbfb5b845674fc
2021-05-20 13:55:12 -07:00
Christopher Ferris
d1172f3b04 Merge "Add a cherry-pick exception." am: 9510033467 am: 6733d0ef8a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1711190

Change-Id: I81ac1a60ab33b059488109f1aa7efada363bb3ff
2021-05-18 23:36:45 +00:00
Treehugger Robot
6a958235ec Merge "Revert^2 "Fix incompatibilities with Kotlin 1.5.0"" am: b7bccf0c76 am: c4db697186
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1709778

Change-Id: If3e51f818d2ac479af7f829b0781fbefffe028f4
2021-05-18 23:17:14 +00:00
Patrick Baumann
62bf50bbd8 Merge changes I04dfc5c2,Idc7e1f3c am: 1ef34e9022 am: 4c56bac295
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705089

Change-Id: Ibea92e6623d660b0bcbc324c8f188642841160dd
2021-05-18 23:16:02 +00:00
Christopher Ferris
9510033467 Merge "Add a cherry-pick exception." 2021-05-18 22:50:29 +00:00
Treehugger Robot
b7bccf0c76 Merge "Revert^2 "Fix incompatibilities with Kotlin 1.5.0"" 2021-05-18 20:54:38 +00:00
Christopher Ferris
9fbe8a8279 Add a cherry-pick exception.
If someone is trying to cherry-pick back to aosp, don't force them
to use --no-verify, allow it.

Right now, the only form of cherry-pick allowed is:

  cherry picked from

Test: Ran on a commit with the message and without and observed that
Test: with the cherry pick message, no error, without, error message.
Change-Id: I27581f782cdc1a1c4fa207a3aae392c0d434eb5a
2021-05-18 13:49:08 -07:00
Patrick Baumann
1ef34e9022 Merge changes I04dfc5c2,Idc7e1f3c
* changes:
  Updates OWNERS files
  Update OWNERS file.
2021-05-18 19:03:06 +00:00
Aurimas Liutikas
b715c4d730 Revert^2 "Fix incompatibilities with Kotlin 1.5.0"
c5b4071877530ba3eb6ce5f55fc8c101ea1f35e4

Change-Id: I1fc09f028411cce8bdaa9eec68eaf88116f2143f
2021-05-17 17:41:41 +00:00
Patrick Baumann
e6c0a4f8ce Updates OWNERS files
Bug: 186864416
Test: Builds
Change-Id: I04dfc5c2c7143825334ebc62742e335b8c889492
2021-05-14 15:45:42 +00:00
Elliott Hughes
05ba318dfc Merge "Remove a use of String16::remove." am: 0529640cc0 am: c881ac71b5 am: 9853e8a94e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1704170

Change-Id: I31b89ce8b8504388deab49d9af7410f8d64b78fd
2021-05-13 19:44:55 +00:00
Aurimas Liutikas
b357fadd1e Merge "Revert "Fix incompatibilities with Kotlin 1.5.0"" am: f1e2bb9a81 am: c2db9c85cc am: 51a1b7d082
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705633

Change-Id: I20f9e94bb3241e07052edbe8c042162c2ad6f118
2021-05-12 23:09:41 +00:00
Aurimas Liutikas
c5b4071877 Revert "Fix incompatibilities with Kotlin 1.5.0"
This reverts commit b8ca1157ab6d463a19f6a7bbfeb25d1f9f1be911.

Reason for revert: b/187908823

Change-Id: I9606c5730f4e8697a9319939acda0a9b7a74634d
2021-05-12 21:56:31 +00:00
Elliott Hughes
0523328a00 Remove a use of String16::remove.
This function, ironically, is being removed. This is one of only two
users, and it's pretty hard to use correctly. In this case, using one
of the existing constructors to keep a prefix seems clearer even in a
world where remove() was better implemented.

Test: treehugger
Change-Id: Icdf02d9fcc059c396c13787d9bb4e8bda5658656
2021-05-11 16:24:35 -07:00