Commit Graph

32372 Commits

Author SHA1 Message Date
Felka Chang
ead4b2ad8c Add Android Resources CLion project file
This patch adds a new CLion project for developing Android Resources.
* aapt2
* libaapt2
* aapt2_test
* idmap2
* idmap2d
* libidmap2
* libidmap2_protos
* libidmap2aidl
* idmap2_test
* libandroidfw
* libandroidfw_tests
* libandroidfw_benchmark
* lbandroidfw_fuzzer_lib
* resourcefile_fuzzer
* libandroid_runtime
* etc.

Test: export SOONG_GEN_CMAKEFILES=1 ;\
      export SOONG_GEN_CMAKEFILES_DEBUG=1 ;\
      make droid aapt2_test idmap2_tests libandroidfw_benchmark ;\
      /opt/clion-stable/bin/clion.sh \
      out/development/ide/clion/frameworks/base/cmds/

Bug: 204725414
Change-Id: Iddafa146f78ad7c7d38396f38ea9aaf8b5d97c88
2021-11-01 18:45:18 +08:00
Treehugger Robot
da743c4651 Merge "Add OWNERS to vndk snapshot directories" am: 657f7aa040 am: d5dd42f497 am: 64dd451a05 am: fced4e3d51 am: f7ec8e2269
Original change: https://android-review.googlesource.com/c/platform/development/+/1870194

Change-Id: I3abb20db25cbddd8cf0971dcb04105d814a1d80d
2021-10-26 07:12:51 +00:00
Treehugger Robot
f7ec8e2269 Merge "Add OWNERS to vndk snapshot directories" am: 657f7aa040 am: d5dd42f497 am: 64dd451a05 am: fced4e3d51
Original change: https://android-review.googlesource.com/c/platform/development/+/1870194

Change-Id: I5bb6e18a665a5493dbdf76ce9fb3dd40ddb728ef
2021-10-26 06:55:29 +00:00
Treehugger Robot
fced4e3d51 Merge "Add OWNERS to vndk snapshot directories" am: 657f7aa040 am: d5dd42f497 am: 64dd451a05
Original change: https://android-review.googlesource.com/c/platform/development/+/1870194

Change-Id: Ib6df05d3a326ef19d8ddc73ebd73f25c4d07e25e
2021-10-26 06:42:52 +00:00
Treehugger Robot
64dd451a05 Merge "Add OWNERS to vndk snapshot directories" am: 657f7aa040 am: d5dd42f497
Original change: https://android-review.googlesource.com/c/platform/development/+/1870194

Change-Id: I9f50557ed7dfae5b872f2205c5623f2902e90294
2021-10-26 06:28:12 +00:00
Treehugger Robot
d5dd42f497 Merge "Add OWNERS to vndk snapshot directories" am: 657f7aa040
Original change: https://android-review.googlesource.com/c/platform/development/+/1870194

Change-Id: I9749935eaf964cfb07da96f3b4e176d7e7af8c0d
2021-10-26 06:13:13 +00:00
Treehugger Robot
657f7aa040 Merge "Add OWNERS to vndk snapshot directories" 2021-10-26 05:59:51 +00:00
Justin Yun
084664b95a Add OWNERS to vndk snapshot directories
Copy the OWNERS in this directory to the VNDK snapshot prebuilt
directories to protect the snapshots from random updates.

Bug: 202780389
Test: generate snapshots
Change-Id: I778616762ee017f87c771fbf6628887178fda86f
2021-10-26 13:33:05 +09:00
TreeHugger Robot
697db8c073 Merge "Case insensitive filter on winscope" 2021-10-25 19:29:16 +00:00
Joel Galenson
7045497a98 Merge "Document the expectations of two arguments." am: 0038349332 am: da9c6533d9 am: 4f0f9f5340 am: ba5e9235fa am: da36101878
Original change: https://android-review.googlesource.com/c/platform/development/+/1861785

Change-Id: I1496bbae8648543aadc3e0ba96939646a97e39ad
2021-10-25 18:01:49 +00:00
Joel Galenson
da36101878 Merge "Document the expectations of two arguments." am: 0038349332 am: da9c6533d9 am: 4f0f9f5340 am: ba5e9235fa
Original change: https://android-review.googlesource.com/c/platform/development/+/1861785

Change-Id: If4106334af2e90cffecd053c83e31b7785c99a49
2021-10-25 17:49:24 +00:00
Joel Galenson
ba5e9235fa Merge "Document the expectations of two arguments." am: 0038349332 am: da9c6533d9 am: 4f0f9f5340
Original change: https://android-review.googlesource.com/c/platform/development/+/1861785

Change-Id: Ibdfc0b67f73ca33363b7f49cac5eceb5b762028b
2021-10-25 17:31:02 +00:00
Joel Galenson
4f0f9f5340 Merge "Document the expectations of two arguments." am: 0038349332 am: da9c6533d9
Original change: https://android-review.googlesource.com/c/platform/development/+/1861785

Change-Id: I8819bdb20a35b9499123f5ecb739da47d1235538
2021-10-25 17:13:48 +00:00
Joel Galenson
da9c6533d9 Merge "Document the expectations of two arguments." am: 0038349332
Original change: https://android-review.googlesource.com/c/platform/development/+/1861785

Change-Id: If7d6c9e146578457f1d084defcbae3c3da9c4811
2021-10-25 16:58:12 +00:00
Joel Galenson
0038349332 Merge "Document the expectations of two arguments." 2021-10-25 16:45:04 +00:00
Jerome Gaillard
c1db1a92e5 Merge "Do not include layoutlib in the SDK sources" 2021-10-25 11:18:47 +00:00
TreeHugger Robot
9d6db99759 Merge "Allow filtering multiple properties in the transation log" 2021-10-25 09:25:46 +00:00
Jerome Gaillard
27ec925d47 Do not include layoutlib in the SDK sources
The project inside frameworks/layoutlib is only used by Android Studio
for rendering Android resources. It is not part of the Android OS, and
it doesn't make sense that it is included in the SDK sources.

Bug: N/A
Test: build SDK sources and check no file from frameworks/layoutlib
present
Change-Id: Ie88108776cc73c398e1b4a023d9889f36394b127
2021-10-21 17:20:37 +00:00
Christopher Ferris
a67ea97977 Merge "Small script fixes." am: 0d4977e7cd am: 0b29aa1937 am: ad2ec44db5 am: 45b9975a24 am: f5ce992a21
Original change: https://android-review.googlesource.com/c/platform/development/+/1866054

Change-Id: Ief1d0504fbc66cccfc7362057e7eb304b0a03a56
2021-10-21 04:47:47 +00:00
Christopher Ferris
f5ce992a21 Merge "Small script fixes." am: 0d4977e7cd am: 0b29aa1937 am: ad2ec44db5 am: 45b9975a24
Original change: https://android-review.googlesource.com/c/platform/development/+/1866054

Change-Id: I96b8c92ee19134b58bd585e695d91ee6c7ccff68
2021-10-21 04:32:37 +00:00
Christopher Ferris
45b9975a24 Merge "Small script fixes." am: 0d4977e7cd am: 0b29aa1937 am: ad2ec44db5
Original change: https://android-review.googlesource.com/c/platform/development/+/1866054

Change-Id: I601284212d3cdebb7996d11407227ba27faecc56
2021-10-21 04:18:17 +00:00
Christopher Ferris
ad2ec44db5 Merge "Small script fixes." am: 0d4977e7cd am: 0b29aa1937
Original change: https://android-review.googlesource.com/c/platform/development/+/1866054

Change-Id: I28a8bcd33c9a6309c0304a2d7e7d4869084763aa
2021-10-21 03:54:12 +00:00
Christopher Ferris
0b29aa1937 Merge "Small script fixes." am: 0d4977e7cd
Original change: https://android-review.googlesource.com/c/platform/development/+/1866054

Change-Id: Idb30b1d0edee49f9e8359385df2fb1933ec53e06
2021-10-21 03:39:35 +00:00
Christopher Ferris
0d4977e7cd Merge "Small script fixes." 2021-10-21 03:27:23 +00:00
Christopher Ferris
7ea56f02c8 Small script fixes.
Fix a problem with python3 and the zipinfo processing of an apk.

Add sorting of the zipinfo data since it's not guaranteed that
the zip entries will be in sorted order, so sort them.

Bug: https://github.com/android/ndk/issues/1587

Test: Ran a apk stack line through the script.
Test: Ran the stack core unit tests.
Change-Id: Ie5ea67ad54a6b2de077e53740c82265f6bf783c6
2021-10-21 00:35:13 +00:00
Treehugger Robot
a5c4b6131c Merge "[LSC] Add LOCAL_LICENSE_KINDS to development" am: 44150bc2e2 am: af61d8ca10 am: dbc20bf1cc am: 38cf43a65d am: 8861cdeedf
Original change: https://android-review.googlesource.com/c/platform/development/+/1865694

Change-Id: I573846fd11f59c824de59abce55e37b069fe97d6
2021-10-21 00:26:46 +00:00
Treehugger Robot
8861cdeedf Merge "[LSC] Add LOCAL_LICENSE_KINDS to development" am: 44150bc2e2 am: af61d8ca10 am: dbc20bf1cc am: 38cf43a65d
Original change: https://android-review.googlesource.com/c/platform/development/+/1865694

Change-Id: I12a1a85a7c676d597f8c49571662d4fe8bfa2f8e
2021-10-21 00:08:54 +00:00
Treehugger Robot
38cf43a65d Merge "[LSC] Add LOCAL_LICENSE_KINDS to development" am: 44150bc2e2 am: af61d8ca10 am: dbc20bf1cc
Original change: https://android-review.googlesource.com/c/platform/development/+/1865694

Change-Id: Ifef72863be385855a82cbd15db6fe3fdc983bf8a
2021-10-20 23:49:43 +00:00
Treehugger Robot
dbc20bf1cc Merge "[LSC] Add LOCAL_LICENSE_KINDS to development" am: 44150bc2e2 am: af61d8ca10
Original change: https://android-review.googlesource.com/c/platform/development/+/1865694

Change-Id: I875829ace69d1a52f325f33c71cce252371c26f7
2021-10-20 23:33:45 +00:00
Treehugger Robot
af61d8ca10 Merge "[LSC] Add LOCAL_LICENSE_KINDS to development" am: 44150bc2e2
Original change: https://android-review.googlesource.com/c/platform/development/+/1865694

Change-Id: I5595dbd52e1c8b4e4500342bb130ba28b706df56
2021-10-20 23:19:04 +00:00
Treehugger Robot
44150bc2e2 Merge "[LSC] Add LOCAL_LICENSE_KINDS to development" 2021-10-20 22:49:14 +00:00
Bob Badour
665239b180 [LSC] Add LOCAL_LICENSE_KINDS to development
Added SPDX-license-identifier-Apache-2.0 to:
  apps/OBJViewer/Android.bp
  build/Android.bp
  samples/HeavyWeight/Android.bp
  samples/MySampleRss/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all
Change-Id: Ifea680956185592ef0d06e29201da596451b3996
2021-10-20 14:13:22 -07:00
Nataniel Borges
1bbf014566 Allow filtering multiple properties in the transation log
Currently only one property can be searched at a time

Test: build winscope, record a transaction log and select fields to
filter
Bug: 159619726

Change-Id: I9712ca9a9ddc11e20d44e7c5c671803de386f368
2021-10-19 13:19:49 +00:00
Nataniel Borges
bfefca1c6d Case insensitive filter on winscope
Property and element search should be case insensitive

Test: build winscope, open a trace, filter layer or property by name
Bug: 203240981
Change-Id: I91575d550b3812b6a893136e965b0f1672389ab7
2021-10-19 12:45:14 +00:00
Nataniel Borges
82ac2cd45c Merge "Fix parsing of WM trace in critical mode" 2021-10-19 10:01:46 +00:00
Joel Galenson
493c26a8d4 Document the expectations of two arguments.
To work with the updater, these files must have a certain prefix.

Test: Run with --help and upgrade a crate.
Change-Id: Icdc492479223865c39d6c6f10b84fe3d762f5d1d
2021-10-18 15:54:41 -07:00
Joel Galenson
b6dcd51bdb Merge "Do not generate empty Rust tests." am: 4506b51f47 am: 99f7bbcd14 am: 04ea9aa94a am: 188b30b20d am: 11bd577f8e
Original change: https://android-review.googlesource.com/c/platform/development/+/1858470

Change-Id: Ide51bad709c56e43a2c7890ca41abd2acee73634
2021-10-18 18:43:45 +00:00
Joel Galenson
11bd577f8e Merge "Do not generate empty Rust tests." am: 4506b51f47 am: 99f7bbcd14 am: 04ea9aa94a am: 188b30b20d
Original change: https://android-review.googlesource.com/c/platform/development/+/1858470

Change-Id: I68d3d5f89f6cc945bd7f37b064b1c02e5c93d6ab
2021-10-18 18:33:35 +00:00
Joel Galenson
188b30b20d Merge "Do not generate empty Rust tests." am: 4506b51f47 am: 99f7bbcd14 am: 04ea9aa94a
Original change: https://android-review.googlesource.com/c/platform/development/+/1858470

Change-Id: Ib9ee84101cd39556494442b72d1d61d953ce2b67
2021-10-18 18:19:11 +00:00
Joel Galenson
04ea9aa94a Merge "Do not generate empty Rust tests." am: 4506b51f47 am: 99f7bbcd14
Original change: https://android-review.googlesource.com/c/platform/development/+/1858470

Change-Id: I38d358fbbb45fa261b9b9e5a2a78f78162b6df54
2021-10-18 17:53:43 +00:00
Joel Galenson
99f7bbcd14 Merge "Do not generate empty Rust tests." am: 4506b51f47
Original change: https://android-review.googlesource.com/c/platform/development/+/1858470

Change-Id: Ic9098295ccd98a8fbbab74fba99bafbb0e506dae
2021-10-18 17:36:22 +00:00
Joel Galenson
4506b51f47 Merge "Do not generate empty Rust tests." 2021-10-18 17:21:43 +00:00
Anton Hansson
377c696b69 Merge "Use generated merged annotations.zip in SDK build" am: ed19ee5981 am: 6ca55f583c am: 247163d8fa am: 6f027103d2 am: 1718ea4476
Original change: https://android-review.googlesource.com/c/platform/development/+/1859259

Change-Id: I273a5b40ce6c72f7bccb02a8d2d2095c0b009aec
2021-10-18 11:09:10 +00:00
Anton Hansson
1718ea4476 Merge "Use generated merged annotations.zip in SDK build" am: ed19ee5981 am: 6ca55f583c am: 247163d8fa am: 6f027103d2
Original change: https://android-review.googlesource.com/c/platform/development/+/1859259

Change-Id: I151e9b08f84fa97a362dc86461cc3a490391a400
2021-10-18 10:53:24 +00:00
Anton Hansson
6f027103d2 Merge "Use generated merged annotations.zip in SDK build" am: ed19ee5981 am: 6ca55f583c am: 247163d8fa
Original change: https://android-review.googlesource.com/c/platform/development/+/1859259

Change-Id: If7bd94e7c0809f16308e841eefe94fb916a87a74
2021-10-18 10:35:38 +00:00
Anton Hansson
247163d8fa Merge "Use generated merged annotations.zip in SDK build" am: ed19ee5981 am: 6ca55f583c
Original change: https://android-review.googlesource.com/c/platform/development/+/1859259

Change-Id: Ib804d5b9a5e75f3b8952b7f7a10cbb9026ba489d
2021-10-18 10:17:45 +00:00
Anton Hansson
6ca55f583c Merge "Use generated merged annotations.zip in SDK build" am: ed19ee5981
Original change: https://android-review.googlesource.com/c/platform/development/+/1859259

Change-Id: I9f2bda05da53d9adab5c19f23a92f67eae74f2f7
2021-10-18 10:07:13 +00:00
Anton Hansson
ed19ee5981 Merge "Use generated merged annotations.zip in SDK build" 2021-10-18 09:54:05 +00:00
Treehugger Robot
6092c6e112 Merge "Remove sdk-linux-x86.atree as well" am: 9cf4face61 am: f9c6180263 am: c7fd992149 am: 337af225ba am: 05ec491fef
Original change: https://android-review.googlesource.com/c/platform/development/+/1860413

Change-Id: I3872ccd6fda534ee425409fbef9ca2a7ccd16040
2021-10-17 03:34:52 +00:00
Treehugger Robot
05ec491fef Merge "Remove sdk-linux-x86.atree as well" am: 9cf4face61 am: f9c6180263 am: c7fd992149 am: 337af225ba
Original change: https://android-review.googlesource.com/c/platform/development/+/1860413

Change-Id: I409517c44eb79b9d1d1600f03f594d40bf63d40b
2021-10-17 03:23:31 +00:00