Commit Graph

7684 Commits

Author SHA1 Message Date
Donald Chai
49956a73c1 Revert "Escape single quotes in aapt2"
This reverts commit c90f42c80f.

Reason for revert: Introduces the escaping *into the APKs*; as mentioned in b/140373430#comment3 the Right Way to dump XML is via textproto.
Fix: 222745626
Bug: 140373430

Change-Id: I775b8a304e76a83934c36886c17cf23560914d21
Merged-In: I775b8a304e76a83934c36886c17cf23560914d21
(cherry picked from commit 27e9a4a85f)
2022-05-03 07:01:45 +00:00
Yurii Zubrytskyi
f453228161 frameworks/base - Tiramisu is now 33 #2
Set current API level

Test: Build and boot
Bug: 225745567
Change-Id: If135d9795e812cc286c720b9351eaf6be621fd5b
2022-04-12 12:35:04 -07:00
Yurii Zubrytskyi
bb014567f5 frameworks/base - Tiramisu is now 33
Removed deprecated at birth APIs

Test: build and boot
Bug: 225745567
Change-Id: I8a40f4a08e521a7c9632d7652ff1f51fb137b34d
2022-04-12 08:25:15 -07:00
Anton Hansson
4fd0b29105 Merge "Update deprecated_at_birth script" am: 033de61f59 am: 01673de24e am: 88a6b630aa
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2059569

Change-Id: Ice3324baec83320357de3bb38e22ec144f8c8f8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 15:19:12 +00:00
Anton Hansson
01673de24e Merge "Update deprecated_at_birth script" am: 033de61f59
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2059569

Change-Id: I789294f78d144121a9d9336cf922b803a6b47458
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 14:43:31 +00:00
Anton Hansson
65163dd0e1 Update deprecated_at_birth script
Make it executable, make it work with python3.

Bug: 228451704
Test: $ m api_txt dist
      $ PREVIOUS_API=prebuilts/sdk/##
      $ for api in $(ls -1 out/dist/apistubs/android); do
          frameworks/base/tools/apilint/deprecated_at_birth.py \
          out/dist/apistubs/android/$api/api/ \
          ${PREVIOUS_API}/$api/api/
        done
Change-Id: Ib0eda541be68b0b21ae0dea3f51a82b44f7f9e7c
2022-04-08 11:46:22 +01:00
Treehugger Robot
2f58e1c38c Merge "Change aapt2 to specify full protos" am: 6787226865 am: 3da3dce716 am: ccd8e91bf1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2037107

Change-Id: I23fd8af293fc5acd7748294d6cb61289565b8c1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 21:32:06 +00:00
Treehugger Robot
3da3dce716 Merge "Change aapt2 to specify full protos" am: 6787226865
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2037107

Change-Id: I6d4221ca092ff126676c3f93925c83268a339506
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 21:07:04 +00:00
Treehugger Robot
6787226865 Merge "Change aapt2 to specify full protos" 2022-04-06 19:29:13 +00:00
Treehugger Robot
2cb1c26875 Merge "Non-module targets." am: 3f0139b119 am: 6dc0c9f780 am: 824f062400
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2052132

Change-Id: I27b00e66ce73673d6add6d74a78b6eff0639b1b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-04 14:31:29 +00:00
Treehugger Robot
6dc0c9f780 Merge "Non-module targets." am: 3f0139b119
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2052132

Change-Id: I9d78eb2f88f9ed97a36d6757744b4406435d3853
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-04 14:01:04 +00:00
Treehugger Robot
3f0139b119 Merge "Non-module targets." 2022-04-04 13:34:50 +00:00
Xin Li
be28e53132 Merge changes from topic "merge_8391262" into stage-aosp-master
* changes:
  Fixup OWNERS file merge conflicts.
  Merge Android 12 QPR3 ab/8391262
2022-04-03 06:41:20 +00:00
Treehugger Robot
e1cbf0b117 Merge "Add context to error message." am: 0754714469 am: 82e2afb277 am: e210ca9e34
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2052076

Change-Id: I4669a3e8ffd72d7591d4c6713942072f998b82f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 22:56:53 +00:00
Treehugger Robot
e210ca9e34 Merge "Add context to error message." am: 0754714469 am: 82e2afb277
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2052076

Change-Id: I386d9460938f2045d41b0c6c19902d0a16fdca4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 22:37:15 +00:00
Bob Badour
93aa95f71a Add context to error message.
Would have been very useful to avoid http://b/227682097

Bug: 227682097

Test: m apexer apexer_test deapexer debugfs_static; atest --host apexer_test
Change-Id: I24234d053a06868493831d40f94f7e46956391a1
2022-04-01 15:21:26 +00:00
Bob Badour
a61f3e446f Non-module targets.
Bug: 151177513
Bug: 213388645
Bug: 210912771

Test: m droid dist reportmissinglicenses

Change-Id: I1982a50b33924a051d7cfcdf18dd1f0f00fa1c0f
2022-03-31 19:37:56 -07:00
Liz Kammer
ba0a32c303 Change aapt2 to specify full protos
Soong's cc support for protos is inconsistent, it adds a dependency on
lite proto library is proto.type is unspecified, but builds as full.
Update aapt2 to explicitly build full protos rather than rely on
Soong's inconsistent defaulting of proto.type

Test: CI
Change-Id: I5600d04c7ac32a04fd2b230912e02280a3874812
2022-03-28 21:40:53 +00:00
Rod S
353491d69a Update fontchain_lint to detect lack of PUA in emoji font
Bug: 226676748
Test: Confirmed that the updated fontchain lint fails on the COLR font w/o PUA and passes once added
Change-Id: If831ed689ce80f26564279c6a6243cedddc56c36
2022-03-26 16:20:28 -07:00
Allen Hair
cfe8d5b246 Merge "Update asm-7.0 to asm-9.2." am: ad55d80482 am: 92864663c1 am: 100d91e9f3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2016115

Change-Id: I556bf78799ec0fcd9d32eb16a2bd7a023ab5c7fd
2022-03-22 17:50:57 +00:00
Allen Hair
100d91e9f3 Merge "Update asm-7.0 to asm-9.2." am: ad55d80482 am: 92864663c1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2016115

Change-Id: I1b81166403e4b751f10e783208a3e6483d74b7e3
2022-03-22 17:43:34 +00:00
Allen Hair
ad55d80482 Merge "Update asm-7.0 to asm-9.2." 2022-03-22 17:03:20 +00:00
Allen Hair
f0cbf9ffcc Merge "Add tool for injecting tracing code into a method." am: a7006818d3 am: 3e53e056ee am: 152a78bd50
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2016118

Change-Id: I7c3f2585e9ca6d4d488fe47b765d5730a5390988
2022-03-16 02:20:41 +00:00
Allen Hair
152a78bd50 Merge "Add tool for injecting tracing code into a method." am: a7006818d3 am: 3e53e056ee
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2016118

Change-Id: If83cc7c52c09e0a226e759755e60ccc9a3412951
2022-03-16 01:55:59 +00:00
Allen Hair
a7006818d3 Merge "Add tool for injecting tracing code into a method." 2022-03-16 01:14:36 +00:00
Colin Cross
24e387ae49 Merge "Tweak linux_glibc properties for musl builds in frameworks/base" am: ee415b6dd4 am: 0465454af5 am: 8927c1f94e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2019598

Change-Id: I33e43c2b80acf35e7f9790d82c98d38bf2134697
2022-03-15 05:02:57 +00:00
Colin Cross
8927c1f94e Merge "Tweak linux_glibc properties for musl builds in frameworks/base" am: ee415b6dd4 am: 0465454af5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2019598

Change-Id: Id281761e429d0876969bd0150fc9ca0356a7dcd6
2022-03-15 04:39:49 +00:00
Colin Cross
ee415b6dd4 Merge "Tweak linux_glibc properties for musl builds in frameworks/base" 2022-03-15 03:43:11 +00:00
Colin Cross
e8f6f0becc Tweak linux_glibc properties for musl builds in frameworks/base
For convenience, builds against musl libc currently use the
linux_glibc properties because they are almost always linux-specific
and not glibc-specific.  In preparation for removing this hack,
tweak the linux_glibc properties by either moving them to host_linux,
which will apply to linux_glibc, linux_musl and linux_bionic, or
by setting appropriate musl or linux_musl properties.  Properties
that must not be repeated while musl uses linux_musl and also still
uses the linux_glibc properties are moved to glibc properties, which
don't apply to musl.  Whether these stay as glibc properties or get
moved back to linux_glibc later once the musl hack is removed is TBD.

Bug: 223257095
Test: m checkbuild
Test: m USE_HOST_MUSL=true host-native
Change-Id: I7058c8f1dadd7bbfd7e169bdf0a0441eb6d10ec5
2022-03-09 16:31:28 -08:00
Treehugger Robot
4ca52f071e Merge "Update StaleDataclassProcessor for JDK 17" am: f9ce0a2c2b am: 03ae92e5f3 am: 415ef94f27
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2007761

Change-Id: Icc88f0ec3f01e5335b944e5dc42cce04c6460a09
2022-03-09 10:58:34 +00:00
Treehugger Robot
415ef94f27 Merge "Update StaleDataclassProcessor for JDK 17" am: f9ce0a2c2b am: 03ae92e5f3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2007761

Change-Id: I61b618c2da21a65597e0b9b1d39d3751742f9be5
2022-03-09 08:08:14 +00:00
Treehugger Robot
f9ce0a2c2b Merge "Update StaleDataclassProcessor for JDK 17" 2022-03-09 07:04:10 +00:00
Allen Hair
f519eb59cd Update asm-7.0 to asm-9.2.
Bug: 194725917
Bug: 221938918
Test: Forrest build.
Change-Id: Ia3429287588acc1e0784dc1fd74f9e60d2c9c6d9
2022-03-08 22:55:11 +00:00
Michael Wright
e0f2c62ff4 Add tool for injecting tracing code into a method.
This tool rewrites the bytecode in the designated JAR files to produce
tracing calls on enter and exit, while making sure to close the tracing
span even on exceptions being thrown.

The idea is mostly to reduce the amount of noise within methods when
just trying to add some tracing.

Test: atest --host TraceInjectionTests
Change-Id: If6acb72f34cbb83d9b041a62ee3d8c2abf74b69e
Merged-In: If6acb72f34cbb83d9b041a62ee3d8c2abf74b69e
2022-03-08 22:52:52 +00:00
Winson
8d4fc82250 Document resources staging groups and finalization
Includes instructions on how to expose new public resource IDs
and how to "remove" unused resource IDs before finalization.

Temporarily restricts OWNERS to ensure T remains stable until
a long term static analysis solution is found.

Fixes the script for finalization to handle split files and
seed the next release's staging-public-group blocks.

Bug: 222537368

Test: manual, checked build before and after mock finalization

Change-Id: I901a80e487f5eaab9689f469196648535857e0e1
2022-03-08 09:11:37 -08:00
Winson Chiu
c84829d2d4 AAPT2: support removed_ entries in groups
Ignores and increments the ID if the entry contains removed_, to prevent
shifting IDs by leaving a hole, allowing staging resources to be removed
before finalization.

This was broken out from the parent change to allow other CLs fixing the
resource IDs to be merged without splitting public.xml.

Bug: 222537368

Test: manual, see bug for other changes

Change-Id: I56f4fd70824bd42ec62f4fa0a2f067e2a3c094b5
2022-03-04 21:36:27 +00:00
Colin Cross
4d7c2941c1 Update StaleDataclassProcessor for JDK 17
JDK 17 no longer allows access to com.sun.tools.javac.code by default,
use the public APIs instead.

Bug: 219098645
Test: m checkbuild
Change-Id: If379935cc4ab9e5c809cc9fbfccbacfd8d87e8c8
2022-03-04 12:51:28 -08:00
Seigo Nonaka
e26eb8ce33 Add legacy emoji font file for compatibility
Bug: 222362958
Test: Manually verified Flutter Gallary shows emoji.
Test: atest CtsTextTestCases CtsGraphicsTestCases
Test: atest FontListParserTest

Change-Id: If5b5ddfb6d0d46cfb8d27cf66843ae95d4b50e03
2022-03-03 18:56:25 +00:00
Treehugger Robot
e2d43ee89e Merge "enable aapt for unbundled builds" am: c3270b85fb am: bd84bca4e1 am: 4bbbeefb86
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2006150

Change-Id: I77148fda55942a07c075472979cdc508b983d0a5
2022-03-03 18:47:36 +00:00
Treehugger Robot
4bbbeefb86 Merge "enable aapt for unbundled builds" am: c3270b85fb am: bd84bca4e1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2006150

Change-Id: Iecbcf9eeea01ce03308c546cd804e06743154998
2022-03-03 18:25:50 +00:00
Treehugger Robot
bd84bca4e1 Merge "enable aapt for unbundled builds" am: c3270b85fb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2006150

Change-Id: I0039b269359efb08090b5f7ae8cc5da77bcf6150
2022-03-03 18:02:25 +00:00
Guang Zhu
d6630f5fa7 enable aapt for unbundled builds
It was available for unbundled builds when the build rules were in mk form and aapt2 is enabled for unbundled, so there's not a strong reason why aapt should be disabled for unbundled build

Change-Id: I6589eafbe8d2e423c9ac925b3614763fa6a511ac
Fixes: 217747798
Test: local compile
2022-03-02 20:40:45 +00:00
George Burgess
6ed5d640fe Merge "bit: avoid calling strdup(NULL)" am: 589f3e4871 am: 96c1b4bd0e am: 5fdccc4578
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1995590

Change-Id: I0afc27ac42bd9c2a1d604a5f6915159bdcad9c99
2022-02-24 04:58:49 +00:00
George Burgess
5fdccc4578 Merge "bit: avoid calling strdup(NULL)" am: 589f3e4871 am: 96c1b4bd0e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1995590

Change-Id: Ia9ce5f63427a3ec9fdf92be93bd54b1f6be5f14f
2022-02-24 04:24:56 +00:00
George Burgess
96c1b4bd0e Merge "bit: avoid calling strdup(NULL)" am: 589f3e4871
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1995590

Change-Id: I5524e43b77097f1bf2c7ac34c877a961cf61b5ad
2022-02-24 04:01:27 +00:00
George Burgess IV
d53c27404d bit: avoid calling strdup(NULL)
It seems the behavior of strdup is undefined when NULL is passed in.
Clang's static analyzer complains about this:

> frameworks/base/tools/bit/command.cpp:195:25: warning: Null pointer
passed to 1st parameter expecting 'nonnull'
[clang-analyzer-core.NonNullParamChecker]

Since we don't seem to care about malloc failures (which is a good thing
IMO), adding a second check for the successful completion of `strdup`
seems pointless.

Bug: 206470603
Test: TreeHugger
Change-Id: Ib621659e6fb600203694974f02d96ba0acb3362f
2022-02-22 13:03:04 -08:00
Iurii Makhno
cff10cec6c Switch ResourceName to use ResourceNamedType instead of ResourceType.
DD: go/custom-resource-types-in-aapt2

Bug: b/215108200
Test: Resource_test.cpp
Change-Id: I0b97fc0024523700e01adce788bb934d388da288
2022-02-16 20:23:24 +00:00
Iurii Makhno
dfbac39d38 Introduce ResourceNamedType that represents pair of name + ResourceType.
This type will be used as part of ResourceName to support types with
custom names inside aapt2.

DD: go/custom-resource-types-in-aapt2

Bug: b/215108200
Test: Resource_test.cpp
Change-Id: Ib09776e6b2f69fefb9724136a345dc25bea42573
2022-02-16 20:07:05 +00:00
Xin Li
5ad6db7742 Merge sc-v2-dev-plus-aosp-without-vendor@8084891
Bug: 214455710
Merged-In: I8cfa435bb6233818adb9cc99dadeeb06a03443d5
Change-Id: Ib93992d88fd1704179009a3872798b9e7b83a6d1
2022-02-11 07:25:43 +00:00
Treehugger Robot
4f20090b2c Merge "convert StreamingProtoTest to stream proto type" am: 5aba7d9d19 am: b873429660 am: 3c9fe76aa3 am: 7dceeeda41
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1973039

Change-Id: I2d81c6ca36935625d52a04410a0476190ff0b241
2022-02-11 02:45:33 +00:00