Commit Graph

7608 Commits

Author SHA1 Message Date
Pedro Loureiro
f6b66c3a7d Merge "Add instructions for creating/updating a lint baseline" 2021-12-22 19:56:54 +00:00
Pedro Loureiro
418a63cd46 Add instructions for creating/updating a lint baseline
Test: N/A

Change-Id: I2f55a897d6fb3a89dbd14ec1f020bade5b8d512b
2021-12-22 12:16:52 +00:00
Calvin Pan
fb114cc885 Add am, gl, it, lt, uk into fontchain_linter
Bug: 181262335
Test: m fontchain_lint
Change-Id: Icd616350b05ad2920d7102f774f97c16e78950e0
2021-12-21 12:40:56 +00:00
Makoto Onuki
808fd192fa Support per-process Application class in <process> tag
Bug: 197264681
Test: atest CtsProcessTest
Change-Id: I08889ed16fadb956715499dc7cee567d10988e61
2021-12-10 16:32:11 -08:00
Sorin Basca
be3958b7a3 Merge "Updating locked_region_code_injection to use ASM7" am: 96bbb00369 am: 8c95814002 am: 714440e6d3 am: 1ced75e7b4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1904250

Change-Id: I681e497d00346f58895f8747f91796196aed89a3
2021-12-10 15:13:30 +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
Gavin Corkery
ad5d4baecb Add apex-system-service tag to AndroidManifest.
This change introduces a new <apex-system-service> tag to the manifest.

A manifest may have multiple <apex-system-service> tags, with each tag
denoting one system service that lives in an apex. If the service is
not in SYSTEMSERVERCLASSPATH, the android:path attribute may be used to
indicate where the jar is located on the filesystem. The minSdkVersion
and maxSdkVersion attributes may be used to indicate which SDKs the
service should start on.

Test: atest PackageParserTest
Bug: 192880996
Change-Id: I28e595b397ed8db6c412f490f12c73537972efab
2021-12-08 16:00:26 +00:00
Alex Buynytskyy
a16137055f Revert "Revert "SDK libraries.""
This reverts commit a22b7e05d4.

Reason for revert: This is a roll forwards with the fix applied.

Fixes: 208710019

Change-Id: Id4e9029ebe5864ddcc5583ce525e8e70da79f82c
2021-12-02 19:39:09 +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
Rick Yiu
a22b7e05d4 Revert "SDK libraries."
This reverts commit 8d0ec8faa8.

Reason for revert: DroidMonitor: Potential culprit for Bug 208710019 - verifying through Forrest before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted

Change-Id: Ic1ff41e7648afc0fa50081de9b7d538a49c6468a
2021-12-02 04:23:16 +00:00
Alex Buynytskyy
8d0ec8faa8 SDK libraries.
Design: go/sdk-android

Basic boilerplate code, only adding a concept of SDK library to the OS.
Additional public APIs and more custom processing are to follow.

Tests are added in ag/16348319.
Can't submit together because of the checked build error: AndroidManifest.xml:32: Error: Misspelled tag <sdk-library>: Did you mean <uses-library> ? [ManifestTypo]
Apparently it needs updated aapt2 before it can process the new manifest even though the aapt2 is part of this change.

Bug: 207413168
Test: atest AndroidPackageTest ScanTests PackageManagerSettingsTests PackageManagerComponentLabelIconOverrideTest PackageManagerShellCommandTest

Change-Id: I9ea77ba3a0550ef7d58778a3a6cb402f09e2d8d7
2021-11-30 23:11:28 +00:00
TreeHugger Robot
994d2edbdd Merge "Revert "Revert "Remove the implementation of libaapt2_jni in bui..."" 2021-11-29 19:35:49 +00:00
Vince Harron
821b4cdf55 Merge "BSD grep doesn't support -P" am: 3ad0c61146 am: 6e008cbb2a am: 39465971f4 am: ae3c5c8033
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1891500

Change-Id: I0813007697d746539a2e234f79db13838b7e1cae
2021-11-18 22:52:51 +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
3129a0d453 Merge "AAPT Files - Permit invariant filepaths for getting file names" am: 0ba2a37eaf am: c8b5598a14 am: b568a8202c am: 4b7dd9fced am: 94643cc013
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1884590

Change-Id: I2fbc7dc5f3aea8d574ed00d3ab4f6536fc2bdae0
2021-11-11 11:20:29 +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
b14671ef58 Merge "Update the resources owner files" am: 70d5485b28 am: bbf64f041e am: 2512fc7380 am: 187863655c am: 2999ac25fb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1884705

Change-Id: Ib8678bba4656240da3298446d8c8b7359536d7ff
2021-11-09 18:32:23 +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
Michael Wright
06f673e553 Merge changes from topic "cherrypick-final-32-khu88k0v6u"
* changes:
  Update @RequiresApi declarations for T to be 33.
  Update AAPT for S V2.
2021-11-05 02:10:39 +00:00
Jeremy Meyer
9cc2d10a93 Merge "Dont include day/time or ldap for eng aapt2 builds" 2021-11-02 18:48:57 +00:00
Michael Wright
534f29822a Update AAPT for S V2.
Bug: 204295952
Test: N/A
Change-Id: I14f5d90ae913248e0c9f5776963fa5f66c4f6a7a
2021-11-02 11:58:24 +00:00
Felka Chang
dc0938c090 Revert "Revert "Remove the implementation of libaapt2_jni in bui..."
Revert^2 "Remove the reference of libaapt2_jni in build file"

46fe10698b38f405085a24d23e4371cd1c4bc63c

Change-Id: Id50c2a7cf12d1078ab4afc2d75251c12a34cfc0b
2021-11-02 00:57:46 +00:00
Prateek Shrivastava
1f6d59c541 Merge "Revert "Remove the implementation of libaapt2_jni in build file"" 2021-11-02 00:00:58 +00:00
Prateek Shrivastava
49a757d488 Revert "Remove the implementation of libaapt2_jni in build file"
Revert "Remove the reference of libaapt2_jni in build file"

Revert submission 16102170-remove_libaapt2_jni

Reason for revert: b/204805075 breakages on git_master - BuildMonitor
Reverted Changes:
I2331fcac1:Remove the reference of libaapt2_jni in build file...
I193ff8b5b:Remove the implementation of libaapt2_jni in build...

Change-Id: I37384f995bf34df3cc2654e1439ceecc720243ac
2021-11-01 23:49:52 +00:00
Jeremy Meyer
7f592a8a35 Dont include day/time or ldap for eng aapt2 builds
Previously, eng builds included a fingerprint that was a combination of
the developers ldap, the date, and the time. This meant that the build
system (including RBE) couldn't cache the ouput of aapt. This removes
the ldap, day, and time part of that so that caching will work.

Fixes: 200741997
Test: ran `aapt2 version` to verify the updated format
Change-Id: Id0d1ff99c8fbbf18261d3fc06f21b2969ed2e247
2021-11-01 21:21:48 +00:00
TreeHugger Robot
eda8dd1d0b Merge "Remove the implementation of libaapt2_jni in build file" 2021-11-01 18:35:20 +00:00
TreeHugger Robot
371454135e Merge "Fix bugprone-use-after-move in ResourceParser" 2021-10-28 21:27:28 +00:00
Felka Chang
5cf069b2ea Fix bugprone-use-after-move in ResourceParser
This patch uses reinitialization to solve clang_tidy
bugprone-use-after-move warning in ResourceParser.

The local variables `comment` in functions is used to record comments
in XML. After calling std::move(comment), to use comment.clear() to
reinitialize the value of the variable `comment`.

Reference: https://clang.llvm.org/extra/clang-tidy/checks/\
    bugprone-use-after-move.html

Test: export WITH_TIDY=1 ; \
      rm -rf out/soong/.intermediates/frameworks/base/tools/aapt2* \
      out/host/linux-x86/bin/aapt* \
      out/host/windows-x86/bin/aapt* ;\
      make aapt2

Bug: 150953574
Change-Id: I5658eaedf48e46fb5e7f12a510b83f490f9bc94b
2021-10-29 03:09:55 +08:00
Yurii Zubrytskyi
4ac6788806 [aapt2] Fix finalized resources removal am: 834f4e6c92 am: db1380f10a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16102684

Change-Id: I0b84d396f4fd1e2f330b5c5b68960d44e4847933
2021-10-28 00:10:16 +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
TreeHugger Robot
c27e4cdfa3 Merge "[aapt2] Support ConfigVarying in CTS resources" 2021-10-25 16:37:28 +00:00
Felka Chang
25d2aa2e67 Remove the implementation of libaapt2_jni in build file
libaapt2_jni is ready to phase out. build-tools includes libaapt2_jni.
However, there is no usage of libaapt2_jni in AOSP so this patch
removes the implementation of libaapt2_jni and its header files.

Test: make clean; make

Bug: 203475226
Change-Id: I193ff8b5b2326f83f59f2591d2e2392dd75438d3
2021-10-25 14:35:26 +08:00
Yurii Zubrytskyi
ef4c88179b [aapt2] Support ConfigVarying in CTS resources
Treat it as Stylable, same as XML parsing works

Bug: 203821692
Test: aapt2 dump resources CtsContentTestCases.apk succeeds
Change-Id: I836495743aea1a19af9ed273a6b33f15494b2e97
2021-10-21 16:09:56 -07: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
Ryan Mitchell
19b27099bf [aapt2] Add resource table chunk dumping
Add a dump command to aapt2 to examine the structure of the resource
table structure. This dump command will be kept up-to-date as changes to
the resource table structure are made.

Bug: 193144097
Test: manual run on APK
Change-Id: I75e47d363cace2b1bafe320085a6b38b7bdee5ae
2021-10-18 19:07:54 -07:00
Greg Kaiser
b40f3ab7a1 [aapt2] Move type usage before std::move()
We want to access type.type before we std::move(type).

Bug: 201388769
Test: TreeHugger
Change-Id: I8167d12a3a203be28c0d8b796f1f70757dfd99b4
2021-10-18 06:37:26 -07:00
Jackal Guo
98ad3ae218 Merge "Escape single quotes in aapt2" 2021-10-15 03:26:57 +00:00