Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
684,035 Commits 3 Branches 0 Tags
175aa192cf20829b6797fc20f47d462e2eaba68d
Commit Graph

7550 Commits

Author SHA1 Message Date
Treehugger Robot
e00127f167 Merge "Setting ASM to version 7 in sdkparcelables" am: e0029a5a87 am: 3a0e798ed9 am: 1b91eb3165 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1946689

Change-Id: I46bc58714611c899c6e43b3b264c7ab5a270b04e
 2022-01-18 18:49:10 +00:00
Treehugger Robot
1b91eb3165 Merge "Setting ASM to version 7 in sdkparcelables" am: e0029a5a87 am: 3a0e798ed9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1946689

Change-Id: I4cb9b88255dd582c73be2dfcfdfc7f232110c2ab
 2022-01-18 18:31:00 +00:00
Sorin Basca
e95eaf7f5a Setting ASM to version 7 in sdkparcelables 
This is needed when using Java 11 as target.

Test: m
Bug: 195387473
Change-Id: I18abbdfee4039f9a366070b730930396ff4c210e
 2022-01-18 09:03:12 +00:00
Anton Hansson
392bc3d409 Merge "Improve how "likely an AOSP change" is detected" am: 0b0c098d36 am: 17ac2e2d80 am: 081048aff1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1948796

Change-Id: Ibfc755f0d745ed056eedc36b586ee36b595c077e
 2022-01-14 17:09:44 +00:00
Anton Hansson
081048aff1 Merge "Improve how "likely an AOSP change" is detected" am: 0b0c098d36 am: 17ac2e2d80 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1948796

Change-Id: I564a443788f94a01c452b9a68d0317bd799ca0a9
 2022-01-14 16:56:44 +00:00
Anton Hansson
2f51277ebf Improve how "likely an AOSP change" is detected 
git branch -vv can be incredibly slow (over 5s on my machine/repo), so
when aosp_sha.sh is called multiple times per commit, the repo upload
hook can take a very long time to run (>2 mins for my stack of changes).

The only output used from git branch -vv was the upstream of the current
branch, which can be determined in a much faster/simpler way via
printing the ref name of @{u} (git lingo for the upstream HEAD).

Test: $ { aosp_sha.sh HEAD && echo ok || echo no } in aosp and internal
Change-Id: I993496d8ec9e55c13803590bbb6c5d9d49cde158
 2022-01-13 17:30:18 +00:00
Wei Su
72f49a1a3d Merge "Write files in a temporary directory" am: efa03939f0 am: 49eec50a4a am: 28a89f1860 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1920049

Change-Id: I3e26413428dea2deaeaa25146c65fae71c688718
 2022-01-11 17:20:56 +00:00
Wei Su
28a89f1860 Merge "Write files in a temporary directory" am: efa03939f0 am: 49eec50a4a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1920049

Change-Id: If2e8b41a886a316346b60da996ef3745835c1b0e
 2022-01-11 17:06:06 +00:00
weisu
90d3fb6354 Write files in a temporary directory 
Avoid writing test files in the build output directory which fails when
run with Bazel. This happens because Bazel's sandboxing environment
ensures that the test's working directory is unwritable.

See https://docs.bazel.build/versions/main/sandboxing.html for more
information.

Bug: 209687942
Test: atest --bazel-mode aapt2_tests
Test: atest aapt2_tests

Change-Id: I0fce701bbac255c3e308ad5c85aa27230c3b620b
 2022-01-05 23:05:14 +00:00
Sorin Basca
1ced75e7b4 Merge "Updating locked_region_code_injection to use ASM7" am: 96bbb00369 am: 8c95814002 am: 714440e6d3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1904250

Change-Id: I75b6280aac3f48d75f398d100d14365a7cd56408
 2021-12-10 14:57:49 +00:00
Sorin Basca
714440e6d3 Merge "Updating locked_region_code_injection to use ASM7" am: 96bbb00369 am: 8c95814002 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1904250

Change-Id: I1b26f25b55ad274fbdd8b39ef4209bda01e76b1e
 2021-12-10 14:44:04 +00:00
Sorin Basca
8c95814002 Merge "Updating locked_region_code_injection to use ASM7" am: 96bbb00369 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1904250

Change-Id: Id20e3b36b6bbd23c6415b01cb58ef55b362242e6
 2021-12-10 14:21:24 +00:00
Sorin Basca
fc7aabcf2e Updating locked_region_code_injection to use ASM7 
Bug: 195387073
Test: m
Test: EXPERIMENTAL_TARGET_JAVA_VERSION_11=true m
Change-Id: I34463d3da4d085697f441b4ca68007cafa9d7b69
 2021-12-02 08:16:24 +00:00
Vince Harron
ae3c5c8033 Merge "BSD grep doesn't support -P" am: 3ad0c61146 am: 6e008cbb2a am: 39465971f4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1891500

Change-Id: I4af27181e9739553d5395eddac05f96038d7e634
 2021-11-18 22:28:37 +00:00
Vince Harron
39465971f4 Merge "BSD grep doesn't support -P" am: 3ad0c61146 am: 6e008cbb2a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1891500

Change-Id: Ifae93b7302a5b2d743a4c996c91586da6f23e24e
 2021-11-18 22:04:40 +00:00
Vince Harron
6e008cbb2a Merge "BSD grep doesn't support -P" am: 3ad0c61146 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1891500

Change-Id: Ib7267a0b908187432d1b7cd753ca27e707a2a2f1
 2021-11-18 21:59:12 +00:00
Xin Li
10d9972786 Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 
Bug: 205056467
Merged-In: I13199bc39e9445929195f3d15579cbffe94e92b0
Change-Id: I35fa3c6c2abf679c51033f1395a08d511ed8739f
 2021-11-18 17:00:37 +00:00
Vince Harron
b3a17c77be BSD grep doesn't support -P 
Test: New grep command tested on Linux and macOS
Bug: b/206150971
Change-Id: I9f1684298672fee1561166a03392bd07be8c5cd6
 2021-11-17 22:32:57 +00:00
Luke Edgar
94643cc013 Merge "AAPT Files - Permit invariant filepaths for getting file names" am: 0ba2a37eaf am: c8b5598a14 am: b568a8202c am: 4b7dd9fced 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1884590

Change-Id: Ibcb2b129b94db1d3a83160c2b413792c24509c79
 2021-11-11 11:02:04 +00:00
Luke Edgar
0ba2a37eaf Merge "AAPT Files - Permit invariant filepaths for getting file names" 2021-11-11 09:17:33 +00:00
Luke Edgar
9109a415b2 AAPT Files - Permit invariant filepaths for getting file names 
AAPT compile provides a "--source-path" option that instructs aapt to
use a provided source path rather than the default source resource as
resource orgin. However, this is not file system agnostic. This causes
incorrect outputs of AAPT link, as source path parsing is tied to the
file system. This change ensures that AAPT Files::getFilename can parse
filepaths, regardless of file system filepath type.

Bug: 141301405, 155218379
Test: manually tested on windows with a unix style filepath, passes aapt
tests
Change-Id: I548de01ad513b549dc30eb35d2a59813fa3d4e69
 2021-11-10 10:42:05 +00:00
Treehugger Robot
2999ac25fb Merge "Update the resources owner files" am: 70d5485b28 am: bbf64f041e am: 2512fc7380 am: 187863655c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1884705

Change-Id: I65f147d6f81268b215338bd40a138227ff8befa4
 2021-11-09 18:28:20 +00:00
Yurii Zubrytskyi
4c87aec35f Update the resources owner files 
Bug: 205633893
Test: n/a

Change-Id: Ib9cf70c9acb200e8019a6522cb6a85f85b760651
 2021-11-08 16:25:33 -08:00
Michael Wright
d5f12360fd Merge "Update AAPT for S V2." into sc-v2-dev am: af23af4c83 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16140646

Change-Id: I6b713a4e45e82d2a0ed2a117d505cbd84aea4175
 2021-11-06 16:06:50 +00:00
Michael Wright
6aa3b2c86d Update AAPT for S V2. 
Bug: 204295952
Test: N/A
Change-Id: I14f5d90ae913248e0c9f5776963fa5f66c4f6a7a
Merged-In: I14f5d90ae913248e0c9f5776963fa5f66c4f6a7a
 2021-11-05 19:37:25 +00:00
Yurii Zubrytskyi
b9d75810d5 [res] Finalize resources in SC-v2 RESTRICT AUTOMERGE am: e9e1d94c4a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16102685

Change-Id: Ie6cd8c3eecc0d8923aabe37447028072207803ca
 2021-10-27 23:42:35 +00:00
Yurii Zubrytskyi
db1380f10a [aapt2] Fix finalized resources removal am: 834f4e6c92 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16102684

Change-Id: Iff52edf4399c67d2b0a6b4a9779f2825b277b4f0
 2021-10-27 23:42:20 +00:00
Yurii Zubrytskyi
e9e1d94c4a [res] Finalize resources in SC-v2 RESTRICT AUTOMERGE 
+ modify the finalization script to support new mode -
  staging-public-group

+ support removed items

Bug: 203782582
Test: manual, aapt2 dump on the generated resources

Change-Id: I507f85737d0ba5bf074dd8d98633087ff33c8382
 2021-10-21 18:39:53 +00:00
Yurii Zubrytskyi
834f4e6c92 [aapt2] Fix finalized resources removal 
The code used to expect all original staged resources to get
parsed before their finalized version. Looks like that's not the
actual case, and parsing code needs to expect those to come
later, and preserve the information that they aren't needed
anymore

Bug: 203779955
Test: manual, aapt2 dump resources <finalized framework SDK>
Change-Id: I6d9efe2eb7b406d05ca49a0a6ed745a1c509e2ef
 2021-10-21 09:36:00 -07:00
Colin Cross
bde331f9e7 Merge "Fix framworks/base compiling against musl" am: 2cba49ac56 am: d5b3d74850 am: 1559860d81 am: 4ebc6b077f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1828072

Change-Id: Idee24ad18e175e6806aa933e8ec9f57ec87fba4a
 2021-09-17 02:45:48 +00:00
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
ee9ceb96ca Merge "Mention the tag to use to bypass the AOSP-first check." am: 7c25a55f5d am: 542c95130e am: 82df844f9f am: dd1f40ff29 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1814778

Change-Id: I4377130ed6fdd6866b4913b4f68b0599cc932a64
 2021-08-31 20:02:46 +00: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
b5cb84839c Merge "Stop using group_static_libs property" am: bc8a6d063b am: e29dc9dfe1 am: 452a9dfcd4 am: e44cc3552f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1814336

Change-Id: I7e181af4627d0e0afaab6a3a6ea6222effae044f
 2021-08-31 19:03:37 +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
bce29d1b6f Merge "[lint] add owners to frameworks/base/tools/lint" am: 5834070338 am: 54a4e7a360 am: 0d12a65114 am: cd14c3cf76 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1809160

Change-Id: I6af518bca858eb2f3e0000614e64fd8ac320bdef
 2021-08-27 10:36:12 +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
b8a44c6c21 Merge "Remove unused but set variables" am: 97fe4d0cc4 am: 61555f903b am: 09a4234051 am: 5f6036a5d1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1802956

Change-Id: Ibbc85953f6a8523644bf830990c0e6e67dcc02b5
 2021-08-21 16:58:14 +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
2fb12c777d Add Sv2 to aapt2 codenames 
Bug: 193674948
Test: m checkbuild
Change-Id: Ibf94bae9be5767ffa1422e4d9800cc862dd64ffd
 2021-08-04 23:50:25 +00:00
Colin Cross
06be0817e2 Add Sv2 to aapt2 codenames 
Bug: 193674948
Test: m checkbuild
Merged-In: I3f136f505bce80d0eb7f8b0cca316041730a4580
Change-Id: Ibf94bae9be5767ffa1422e4d9800cc862dd64ffd
 2021-08-04 12:43:40 -07: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 ff02f9a70e)
 2021-07-26 09:42:17 -07:00