LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
31,837 Commits 2 Branches 0 Tags
21a8382038c20049399d60ccd0cb1519d3d97642
Commit Graph

31837 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joel Galenson
3497b061cc Merge "Do not generate cargo_pkg_version when --no-pkg-vers is passed" am: f78de4f942 am: 9bbb76e144 
Original change: https://android-review.googlesource.com/c/platform/development/+/1838728

Change-Id: I472346fc36bd996b6e2fdcb0ced83a7d993bb85d
 2021-10-08 21:39:40 +00:00
Joel Galenson
9bbb76e144 Merge "Do not generate cargo_pkg_version when --no-pkg-vers is passed" am: f78de4f942 
Original change: https://android-review.googlesource.com/c/platform/development/+/1838728

Change-Id: I699fb154db39eda5803c2b6a8c37bd0cf671739b
 2021-10-08 21:26:22 +00:00
Joel Galenson
f78de4f942 Merge "Do not generate cargo_pkg_version when --no-pkg-vers is passed" 2021-10-08 21:12:41 +00:00
Justin Yun
f392a5595f [automerger skipped] Merge "Rename soong outdir to generated-headers" am: 30bf9e8463 am: 290034ac6b -s ours am: a0d2099f8c -s ours am: b32aa079e4 -s ours 
am skip reason: Merged-In I3da7ee98f53e460c448c05ad3456022888099888 with SHA-1 6547080f72 is already in history

Original change: https://android-review.googlesource.com/c/platform/development/+/1850393

Change-Id: I32e41c2bfa3def006d72a67f2c7f350eaef4612f
 2021-10-08 11:30:33 +00:00
Justin Yun
b32aa079e4 [automerger skipped] Merge "Rename soong outdir to generated-headers" am: 30bf9e8463 am: 290034ac6b -s ours am: a0d2099f8c -s ours 
am skip reason: Merged-In I3da7ee98f53e460c448c05ad3456022888099888 with SHA-1 6547080f72 is already in history

Original change: https://android-review.googlesource.com/c/platform/development/+/1850393

Change-Id: Icfb230aafd6dbec206487b5265be1699a58ceff9
 2021-10-08 11:12:54 +00:00
Justin Yun
a0d2099f8c [automerger skipped] Merge "Rename soong outdir to generated-headers" am: 30bf9e8463 am: 290034ac6b -s ours 
am skip reason: Merged-In I3da7ee98f53e460c448c05ad3456022888099888 with SHA-1 6547080f72 is already in history

Original change: https://android-review.googlesource.com/c/platform/development/+/1850393

Change-Id: Ic6d058d7ba01cf279926add9a556988300b70714
 2021-10-08 11:01:36 +00:00
Justin Yun
290034ac6b Merge "Rename soong outdir to generated-headers" am: 30bf9e8463 
Original change: https://android-review.googlesource.com/c/platform/development/+/1850393

Change-Id: I7b95cbb7cd0e0275e4deb3c95021a1160bdf86ae
 2021-10-08 10:43:52 +00:00
Justin Yun
30bf9e8463 Merge "Rename soong outdir to generated-headers" 2021-10-08 10:25:43 +00:00
Nataniel Borges
aee363cc9b [DO NOT MERGE] Sync flicker from master to sc-v2 am: 3907154c2c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/15886687

Change-Id: If0d85a7bae4dfb07c87b1f69a2606a22e7c26966
 2021-10-08 09:04:15 +00:00
Xin Li
aabb85e686 [automerger skipped] Merge "Merge Android 12" am: 230554d6aa -s ours am: 43ed2e7d2d -s ours am: 6461b1d9c7 -s ours am: 89ad76c556 -s ours 
am skip reason: Merged-In I0630a35da632fc31b294afd916dd9dbea5f982fa with SHA-1 0f64e26469 is already in history

Original change: https://android-review.googlesource.com/c/platform/development/+/1847335

Change-Id: I4bd173e77ee172ead3588cabe982243e8c1262b7
 2021-10-08 08:29:25 +00:00
Inseob Kim
deb5beb698 Rename soong outdir to generated-headers 
vndk snapshot captures exported headers as-is, but soong intermediates
directory name is used as a result. It may confuse users, so this
changes the intermediates directory name to "generated-headers".

Bug: 200159267
Test: install snapshot and build
Change-Id: I3da7ee98f53e460c448c05ad3456022888099888
Merged-In: I3da7ee98f53e460c448c05ad3456022888099888
(cherry picked from commit 6547080f72)
 2021-10-08 08:09:36 +00:00
Xin Li
89ad76c556 [automerger skipped] Merge "Merge Android 12" am: 230554d6aa -s ours am: 43ed2e7d2d -s ours am: 6461b1d9c7 -s ours 
am skip reason: Merged-In I0630a35da632fc31b294afd916dd9dbea5f982fa with SHA-1 0f64e26469 is already in history

Original change: https://android-review.googlesource.com/c/platform/development/+/1847335

Change-Id: I1310b97a464a872c9050e0fdc7eea62274900c85
 2021-10-08 07:56:27 +00:00
Xin Li
6461b1d9c7 [automerger skipped] Merge "Merge Android 12" am: 230554d6aa -s ours am: 43ed2e7d2d -s ours 
am skip reason: Merged-In I0630a35da632fc31b294afd916dd9dbea5f982fa with SHA-1 0f64e26469 is already in history

Original change: https://android-review.googlesource.com/c/platform/development/+/1847335

Change-Id: I81b6310fbc749c03fa57f22dcf558d04a8683e59
 2021-10-08 01:39:12 +00:00
Xin Li
43ed2e7d2d [automerger skipped] Merge "Merge Android 12" am: 230554d6aa -s ours 
am skip reason: Merged-In I0630a35da632fc31b294afd916dd9dbea5f982fa with SHA-1 0f64e26469 is already in history

Original change: https://android-review.googlesource.com/c/platform/development/+/1847335

Change-Id: I81aa1561ae79983e21ad3407ca9e014e1986403a
 2021-10-08 01:19:46 +00:00
Xin Li
230554d6aa Merge "Merge Android 12" 2021-10-07 23:50:06 +00:00
Xin Li
67eff0083d Merge Android 12 
Bug: 202323961
Merged-In: I0630a35da632fc31b294afd916dd9dbea5f982fa
Change-Id: Ied87695717aed6defcf188340aad57db79040ad4
 2021-10-06 22:51:55 +00:00
Trevor Radcliffe
137eda00bc Merge "Migrate Dev Tools Build to Soong" am: 1a4503ae57 am: 0f64e26469 am: 7fffbae9d2 am: 83658aa7ab 
Original change: https://android-review.googlesource.com/c/platform/development/+/1845159

Change-Id: Ib4ec6a0bd505a6a5d62fe2ca75a9d6a707c0cd86
 2021-10-06 19:53:33 +00:00
Trevor Radcliffe
83658aa7ab Merge "Migrate Dev Tools Build to Soong" am: 1a4503ae57 am: 0f64e26469 am: 7fffbae9d2 
Original change: https://android-review.googlesource.com/c/platform/development/+/1845159

Change-Id: Iacc093086b8ebf6394e01c3526f8b9ae3b1be812
 2021-10-06 19:38:20 +00:00
Trevor Radcliffe
7fffbae9d2 Merge "Migrate Dev Tools Build to Soong" am: 1a4503ae57 am: 0f64e26469 
Original change: https://android-review.googlesource.com/c/platform/development/+/1845159

Change-Id: Iff8e76d5ef5dd6bff116dbbe550f7375a69ba879
 2021-10-06 19:20:50 +00:00
Trevor Radcliffe
0f64e26469 Merge "Migrate Dev Tools Build to Soong" am: 1a4503ae57 
Original change: https://android-review.googlesource.com/c/platform/development/+/1845159

Change-Id: I0630a35da632fc31b294afd916dd9dbea5f982fa
 2021-10-06 19:08:46 +00:00
Trevor Radcliffe
1a4503ae57 Merge "Migrate Dev Tools Build to Soong" 2021-10-06 18:48:42 +00:00
Trevor Radcliffe
82ffa3fe20 Migrate Dev Tools Build to Soong 
Convert development/apps/Development/Android.mk to Android.bp

Fixes: 202173561
Test: apkanalyzer bit for bit identical apks
Test: Treehugger
Change-Id: Iafa8ae1738f60c27c48ef05c6cab858941273165
 2021-10-06 13:43:52 +00:00
Joel Galenson
84fc7ae226 Merge "Handle versions of the form -a.b.c+foo." am: 75fa9a110d am: e8476ad83f am: 73cda2cd93 am: 32a19a5651 
Original change: https://android-review.googlesource.com/c/platform/development/+/1842045

Change-Id: I274e5020a6b94eefb81cb506600b4c04840c990e
 2021-10-02 00:47:32 +00:00
Joel Galenson
32a19a5651 Merge "Handle versions of the form -a.b.c+foo." am: 75fa9a110d am: e8476ad83f am: 73cda2cd93 
Original change: https://android-review.googlesource.com/c/platform/development/+/1842045

Change-Id: Ib585fbf2768dd6f40f3fe3ab61144930b5da1332
 2021-10-02 00:38:41 +00:00
Joel Galenson
73cda2cd93 Merge "Handle versions of the form -a.b.c+foo." am: 75fa9a110d am: e8476ad83f 
Original change: https://android-review.googlesource.com/c/platform/development/+/1842045

Change-Id: Ib234a016f194971e970bb53f7e5385b9f58a6ccc
 2021-10-02 00:27:21 +00:00
Joel Galenson
e8476ad83f Merge "Handle versions of the form -a.b.c+foo." am: 75fa9a110d 
Original change: https://android-review.googlesource.com/c/platform/development/+/1842045

Change-Id: Iee313709147eeb6856eea4627e51c2e04b6c216c
 2021-10-02 00:11:57 +00:00
Joel Galenson
75fa9a110d Merge "Handle versions of the form -a.b.c+foo." 2021-10-01 23:58:30 +00:00
Joel Galenson
308f3521dd Handle versions of the form -a.b.c+foo. 
Previously we would keep the +x.y.z part, which caused errors in Soong.

See the diff between the first two patchsets in aosp/1833319 for an
example.

Test: Fix the above CL and run on a crate without a +.
Change-Id: I791c85545e67b54e2c8952428211688e7bbf580d
 2021-10-01 15:19:45 -07:00
Joel Galenson
0b6af738f4 Merge "Add more Rust tests to exclude." am: 5bab22b3c2 am: 2e833cf6fc am: 727a90a761 am: 7af7d4b531 
Original change: https://android-review.googlesource.com/c/platform/development/+/1843558

Change-Id: Ib60ac4a644c369075df38959ada33b333511f908
 2021-10-01 19:41:38 +00:00
Joel Galenson
7af7d4b531 Merge "Add more Rust tests to exclude." am: 5bab22b3c2 am: 2e833cf6fc am: 727a90a761 
Original change: https://android-review.googlesource.com/c/platform/development/+/1843558

Change-Id: I1b20131204eaa8b0740e2a3af9b3bf134fb34be4
 2021-10-01 19:28:07 +00:00
Joel Galenson
727a90a761 Merge "Add more Rust tests to exclude." am: 5bab22b3c2 am: 2e833cf6fc 
Original change: https://android-review.googlesource.com/c/platform/development/+/1843558

Change-Id: Ica93cee4e1961411b0013928f5605b49fda39300
 2021-10-01 19:14:57 +00:00
Joel Galenson
2e833cf6fc Merge "Add more Rust tests to exclude." am: 5bab22b3c2 
Original change: https://android-review.googlesource.com/c/platform/development/+/1843558

Change-Id: I0e8079e2543d62ab0b3419623bcca29a6f2747d1
 2021-10-01 18:57:48 +00:00
Joel Galenson
5bab22b3c2 Merge "Add more Rust tests to exclude." 2021-10-01 18:40:43 +00:00
Joel Galenson
2811a3e162 Add more Rust tests to exclude. 
Test: Run script and see it does not add these tests.
Change-Id: I46d1a5fbc12733c91febde81500f0b42dcf87806
 2021-10-01 07:10:14 -07:00
Isaac Chen
d428fb131c Merge "Add kernel test modules for arm64 GKI 5.10" am: 55be24dec6 am: ffd75fde4b am: ba4e637c80 am: 592b92940f 
Original change: https://android-review.googlesource.com/c/platform/development/+/1839801

Change-Id: Ib804d2110322ffbb275a436cfebde847d4d60679
 2021-09-30 08:35:49 +00:00
Isaac Chen
592b92940f Merge "Add kernel test modules for arm64 GKI 5.10" am: 55be24dec6 am: ffd75fde4b am: ba4e637c80 
Original change: https://android-review.googlesource.com/c/platform/development/+/1839801

Change-Id: I56cd5a4af92dd588624d917ca42ee9d1f6bd4b9f
 2021-09-30 08:24:01 +00:00
Isaac Chen
ba4e637c80 Merge "Add kernel test modules for arm64 GKI 5.10" am: 55be24dec6 am: ffd75fde4b 
Original change: https://android-review.googlesource.com/c/platform/development/+/1839801

Change-Id: I7558cdf7d90d43ddc2c785df1c9f3d3d2dcd5060
 2021-09-30 08:14:20 +00:00
Isaac Chen
ffd75fde4b Merge "Add kernel test modules for arm64 GKI 5.10" am: 55be24dec6 
Original change: https://android-review.googlesource.com/c/platform/development/+/1839801

Change-Id: Ia4c6cd20d5cc1c65dc21d6545da5745b22cd45ca
 2021-09-30 08:01:38 +00:00
Isaac Chen
55be24dec6 Merge "Add kernel test modules for arm64 GKI 5.10" 2021-09-30 07:46:16 +00:00
Isaac Chen
a60994f0e0 Add kernel test modules for arm64 GKI 5.10 
7748709	Android 12 GKI 5.10 m9
7739788	Android 12 GKI 5.10 m8 (r2)
7618735	Android 12 GKI 5.10 m7 (r5)

Bug: 201603411
Test: # Set up GKI_DIR and export it.
      $ export GKI_BID=7748709
      $ make ARCH=arm64 CROSS_COMPILE=aarch64 LLVM=1 LLVM_IAS=1 LTO=thin
      $ ls prebuilts
      kmi_sym-a12-5.10-7748709.ko
Change-Id: Iaf01184de60533940f7b5ae1d1d27d3ded8930cc
 2021-09-30 12:23:51 +08:00
Joel Galenson
94b8a8d40c Do not generate cargo_pkg_version when --no-pkg-vers is passed 
If you passed --no-pkg-vers to cargo2android.py, it would still
generate cargo_pkg_version with an empty string.  Instead, simply
don't generate anything.

Test: Use with and without argument.
Change-Id: I544e4789312ccc3481da73c78f0f2cae2ad6619c
 2021-09-28 11:53:51 -07:00
TreeHugger Robot
8d5f83148f Merge "Rename soong outdir to generated-headers" into sc-dev-plus-aosp am: 8da4c4cfeb am: f866a65589 
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/15902808

Change-Id: I87110eaf3b048322bf7cda172711060395913ddd
 2021-09-27 02:10:23 +00:00
TreeHugger Robot
f866a65589 Merge "Rename soong outdir to generated-headers" into sc-dev-plus-aosp am: 8da4c4cfeb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/15902808

Change-Id: I0f9f8b1b746cac63757b73ca069947207e59ebb0
 2021-09-27 02:02:00 +00:00
TreeHugger Robot
8da4c4cfeb Merge "Rename soong outdir to generated-headers" into sc-dev-plus-aosp 2021-09-27 01:49:53 +00:00
Treehugger Robot
45517ef2f0 Merge "Add inseob@ to OWNERS" am: 6188042c71 am: ae20ec1ed3 am: 1be409bd6d am: 92e0cb8d5f 
Original change: https://android-review.googlesource.com/c/platform/development/+/1835075

Change-Id: Ie38bf13ae75b732ab260908348ae418a1af47f17
 2021-09-27 01:21:22 +00:00
Treehugger Robot
92e0cb8d5f Merge "Add inseob@ to OWNERS" am: 6188042c71 am: ae20ec1ed3 am: 1be409bd6d 
Original change: https://android-review.googlesource.com/c/platform/development/+/1835075

Change-Id: I5babc0a9dbee8f0da4889740e106c36ed8c392ef
 2021-09-27 01:11:44 +00:00
Treehugger Robot
1be409bd6d Merge "Add inseob@ to OWNERS" am: 6188042c71 am: ae20ec1ed3 
Original change: https://android-review.googlesource.com/c/platform/development/+/1835075

Change-Id: Ibdf39237ad2c12b17b233c007461fdb799226a46
 2021-09-27 00:55:10 +00:00
Treehugger Robot
ae20ec1ed3 Merge "Add inseob@ to OWNERS" am: 6188042c71 
Original change: https://android-review.googlesource.com/c/platform/development/+/1835075

Change-Id: I96bab2171f9a7c9ec12174c16668482097443be0
 2021-09-27 00:40:31 +00:00
Treehugger Robot
6188042c71 Merge "Add inseob@ to OWNERS" 2021-09-27 00:27:12 +00:00
Inseob Kim
6547080f72 Rename soong outdir to generated-headers 
vndk snapshot captures exported headers as-is, but soong intermediates
directory name is used as a result. It may confuse users, so this
changes the intermediates directory name to "generated-headers".

Bug: 200159267
Test: install snapshot and build
Change-Id: I3da7ee98f53e460c448c05ad3456022888099888
 2021-09-27 09:26:54 +09:00