Commit Graph

51975 Commits

Author SHA1 Message Date
Keun young Park
6e3ba9ac3b Make car apex's library optional in PRODUCT_APEX_SYSTEM_SERVER_JARS
- car-frameworks-service-module is added from com.android.car.framework
  apex which only exisits in car products.

Bug: 203233647
Bug: 203201931
Test: build, bootup
Change-Id: I5f13b0505c1ac4fd2fd7b6559e080c8a6fb526e0
2021-10-19 00:47:47 +00:00
Seth Moore
e4723cdbf9 Merge "Flag an error on empty rust module srcs" am: 6ec96b8102 am: 2e2fb66ecc am: fdf99b1a08 am: a10377c7fd am: c7bd4594fe
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1852788

Change-Id: I99a828c0016ed8cdd3a8deb8d99d124c7af47961
2021-10-14 16:46:02 +00:00
Seth Moore
c7bd4594fe Merge "Flag an error on empty rust module srcs" am: 6ec96b8102 am: 2e2fb66ecc am: fdf99b1a08 am: a10377c7fd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1852788

Change-Id: I5a49c3b31bd2ca254ecfd77c24f12a005dffc88b
2021-10-14 16:31:15 +00:00
Seth Moore
a10377c7fd Merge "Flag an error on empty rust module srcs" am: 6ec96b8102 am: 2e2fb66ecc am: fdf99b1a08
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1852788

Change-Id: Id5601ccffc34d303b88236311405452aacd93c0a
2021-10-14 16:22:24 +00:00
Seth Moore
fdf99b1a08 Merge "Flag an error on empty rust module srcs" am: 6ec96b8102 am: 2e2fb66ecc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1852788

Change-Id: Ie077120f67aa8e01954bedf0534d2530618aa235
2021-10-14 16:07:16 +00:00
Seth Moore
2e2fb66ecc Merge "Flag an error on empty rust module srcs" am: 6ec96b8102
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1852788

Change-Id: I1039d7b57ac4c63cf39779e9f38f5783f17f613d
2021-10-14 15:54:45 +00:00
Seth Moore
6ec96b8102 Merge "Flag an error on empty rust module srcs" 2021-10-14 15:25:17 +00:00
Seth Moore
3afac0b36f Flag an error on empty rust module srcs
It's an error if a rust module's srcs is empty. Prior to this change
the output was a panic that complains loudly about a slice error and
nothing else. This change doesn't stop the panic, but at least adds
a bit of context so devs who make a simple mistake can more easily
fix it.

Test: SOONG_GEN_RUST_PROJECT=1 m nothing
Change-Id: Id7d8465d533413c3000699661222a53a7c8678f3
2021-10-14 15:25:07 +00:00
Liz Kammer
6a2be9d6c9 Merge "Add missing directories to bp2build." am: 47a6c59819 am: 183628579e am: 74f79ad88f am: 7e7dc00983 am: 1cb3a4d9cc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1856736

Change-Id: I19935fd086649dcd2a80c7bcff038e731985b0c1
2021-10-14 15:11:56 +00:00
Liz Kammer
1cb3a4d9cc Merge "Add missing directories to bp2build." am: 47a6c59819 am: 183628579e am: 74f79ad88f am: 7e7dc00983
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1856736

Change-Id: I95fc6a6a38a12101f087d7b0d42c98241a23fb58
2021-10-14 14:57:52 +00:00
Liz Kammer
7e7dc00983 Merge "Add missing directories to bp2build." am: 47a6c59819 am: 183628579e am: 74f79ad88f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1856736

Change-Id: I6d2a2598ddb4cbab526adcd108ac41942e7cbb00
2021-10-14 14:46:51 +00:00
Liz Kammer
74f79ad88f Merge "Add missing directories to bp2build." am: 47a6c59819 am: 183628579e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1856736

Change-Id: Ibc486265c1e3f6d7002f8d45378e5f918960562e
2021-10-14 14:32:45 +00:00
Liz Kammer
183628579e Merge "Add missing directories to bp2build." am: 47a6c59819
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1856736

Change-Id: Idfe2ae1de1b881d563cb96cc5e1ee306a11bda42
2021-10-14 14:20:45 +00:00
Liz Kammer
47a6c59819 Merge "Add missing directories to bp2build." 2021-10-14 14:03:33 +00:00
Yi Kong
002fdcfcfe Add Global ThinLTO option (2nd try) am: 8ea56f9da9 am: 370a0be4b8 am: 2d2452c88e am: 2168e3ba48 am: ead0d42fa9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1857453

Change-Id: I7d62c691182d3cdc567e77779d0c3f02e5a28f4d
2021-10-14 12:39:42 +00:00
Yi Kong
ead0d42fa9 Add Global ThinLTO option (2nd try) am: 8ea56f9da9 am: 370a0be4b8 am: 2d2452c88e am: 2168e3ba48
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1857453

Change-Id: I7391e9e298f6736359b2e61c0c535bfa4d00b95c
2021-10-14 12:29:30 +00:00
Yi Kong
2168e3ba48 Add Global ThinLTO option (2nd try) am: 8ea56f9da9 am: 370a0be4b8 am: 2d2452c88e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1857453

Change-Id: Icb241d6fcc759a37036fed7d237553545102ba24
2021-10-14 12:16:45 +00:00
Yi Kong
2d2452c88e Add Global ThinLTO option (2nd try) am: 8ea56f9da9 am: 370a0be4b8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1857453

Change-Id: I0ff76fd8fbae1193b78071f32ccaa887d8d0beb7
2021-10-14 12:06:54 +00:00
Yi Kong
370a0be4b8 Add Global ThinLTO option (2nd try) am: 8ea56f9da9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1857453

Change-Id: I09ed730f75ae10daf8293ede971b35342d6f61d2
2021-10-14 11:52:00 +00:00
Yi Kong
8ea56f9da9 Add Global ThinLTO option (2nd try)
Instead of making everything into ThinLTO variant by default (it works
but many Soong tests don't like this, and got bit rot due to lack of
active builder for this configuration), let the default option be
ThinLTO and no LTO be a special variant.

Test: m GLOBAL_THINLTO=true
Test: m
Bug: 195134194
Change-Id: I2fd98061ba55eba1fdfdd056fb2f8c2051fd2553
2021-10-14 17:34:13 +08:00
Jiyong Park
81dbef72d4 Merge "Remove use_apex_name_macro" am: ddf4ebae19 am: c05ccb3724 am: 7330b2652e am: e9907ef104 am: 28e6e4098c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1853655

Change-Id: Ida69fb806665f65159f19516b06d8e35e4d99b56
2021-10-14 03:46:27 +00:00
Jiyong Park
28e6e4098c Merge "Remove use_apex_name_macro" am: ddf4ebae19 am: c05ccb3724 am: 7330b2652e am: e9907ef104
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1853655

Change-Id: I96275fdd2eade68191c0ac3723fca73851711a5c
2021-10-14 03:27:09 +00:00
Jiyong Park
e9907ef104 Merge "Remove use_apex_name_macro" am: ddf4ebae19 am: c05ccb3724 am: 7330b2652e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1853655

Change-Id: Ia6ee48fb95bade2ffba995512cbdb9693b33d828
2021-10-14 03:16:56 +00:00
Jiyong Park
7330b2652e Merge "Remove use_apex_name_macro" am: ddf4ebae19 am: c05ccb3724
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1853655

Change-Id: I7eb0ed8bc578db25d4c38735a03aa241eb3c8694
2021-10-14 03:02:00 +00:00
Jiyong Park
c05ccb3724 Merge "Remove use_apex_name_macro" am: ddf4ebae19
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1853655

Change-Id: Ic55eb66ee9414e9a883beba942d3b0616b564139
2021-10-14 02:47:11 +00:00
Jiyong Park
ddf4ebae19 Merge "Remove use_apex_name_macro" 2021-10-14 02:32:43 +00:00
Jiyong Park
91f1b42226 Remove use_apex_name_macro
The property is no longer used.

Bug: 161926892
Test: m
Change-Id: I98948152d6d09bde2eeba4875c7ca01531a24930
2021-10-14 08:57:59 +09:00
Trevor Radcliffe
6a191c006a Merge "Ignore obsolete lines when converting makefiles" am: 8c1ae8f2ff am: 6e4211d099 am: 1b2e2ff8d8 am: 0013b0b8ca am: 496eb3e0a8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1853833

Change-Id: I8cdb0acf07087fcbec9054eb629fb9f6faa36988
2021-10-13 23:24:35 +00:00
Trevor Radcliffe
496eb3e0a8 Merge "Ignore obsolete lines when converting makefiles" am: 8c1ae8f2ff am: 6e4211d099 am: 1b2e2ff8d8 am: 0013b0b8ca
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1853833

Change-Id: I372d972abb84d6b6be05461a7bd2e5d3930f7489
2021-10-13 23:08:49 +00:00
Trevor Radcliffe
0013b0b8ca Merge "Ignore obsolete lines when converting makefiles" am: 8c1ae8f2ff am: 6e4211d099 am: 1b2e2ff8d8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1853833

Change-Id: I0d79a6477d11b15f1c1d1b0b0ecf109f23e7be05
2021-10-13 22:55:12 +00:00
Trevor Radcliffe
1b2e2ff8d8 Merge "Ignore obsolete lines when converting makefiles" am: 8c1ae8f2ff am: 6e4211d099
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1853833

Change-Id: I35e7b80bd1ce33b992ed088c9a5eb14b826beb87
2021-10-13 22:43:21 +00:00
Trevor Radcliffe
6e4211d099 Merge "Ignore obsolete lines when converting makefiles" am: 8c1ae8f2ff
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1853833

Change-Id: I6966aad04ddd80cd2441ebe239c246bee84ea627
2021-10-13 22:22:56 +00:00
Trevor Radcliffe
8c1ae8f2ff Merge "Ignore obsolete lines when converting makefiles" 2021-10-13 22:07:50 +00:00
Liz Kammer
2fc348986c Add missing directories to bp2build.
Added directories with deps of adbd that were not converted and added
them to be converted via bp2build.

Test: bp2build.sh
Test: mixed_droid.sh
Change-Id: Iacb634b23e1fdc2767a0923882b71f482ebca53d
2021-10-13 17:07:41 -04:00
Lev Rumyantsev
da391cd0b4 Merge "Support 64-bit arm_on_x86_64" am: 1eda2bd946 am: 524b468a25 am: 2b9c2fce9a am: 4c005364c3 am: ee83159194
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1854069

Change-Id: I4b5e686e47d900624b7cdf04702f309520ee285f
2021-10-13 21:01:54 +00:00
Lev Rumyantsev
ee83159194 Merge "Support 64-bit arm_on_x86_64" am: 1eda2bd946 am: 524b468a25 am: 2b9c2fce9a am: 4c005364c3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1854069

Change-Id: I7c938b95a343db131f12a2a62aa24e78a45062ac
2021-10-13 20:49:57 +00:00
Lev Rumyantsev
4c005364c3 Merge "Support 64-bit arm_on_x86_64" am: 1eda2bd946 am: 524b468a25 am: 2b9c2fce9a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1854069

Change-Id: I4b4b7075389f3e33ce2e8719fc3263848bcad333
2021-10-13 20:36:31 +00:00
Jay Aliomer
ce0889cb5b [automerger skipped] Added src and exclude_src to debuggable builds am: b9b436fe17 -s ours am: 16689ca997 -s ours
am skip reason: Merged-In I68b6230f30aa2c15e6a80010cd639ea453b4b29e with SHA-1 778582f415 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/16041968

Change-Id: I4521a383ff2f39945ee8f97e8b99e68465a1474e
2021-10-13 20:36:30 +00:00
Lev Rumyantsev
2b9c2fce9a Merge "Support 64-bit arm_on_x86_64" am: 1eda2bd946 am: 524b468a25
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1854069

Change-Id: Ie00b8f40b8a48d66022ee13d18f8b50990eef6a0
2021-10-13 20:20:09 +00:00
Jay Aliomer
16689ca997 [automerger skipped] Added src and exclude_src to debuggable builds am: b9b436fe17 -s ours
am skip reason: Merged-In I68b6230f30aa2c15e6a80010cd639ea453b4b29e with SHA-1 778582f415 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/16041968

Change-Id: I373aba12e5a712be7e5e14788466883b1a4c497a
2021-10-13 20:12:34 +00:00
Lev Rumyantsev
524b468a25 Merge "Support 64-bit arm_on_x86_64" am: 1eda2bd946
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1854069

Change-Id: Id456023beeb4d6e930e60241512a0eeab31c4162
2021-10-13 20:06:42 +00:00
Lev Rumyantsev
1eda2bd946 Merge "Support 64-bit arm_on_x86_64" 2021-10-13 19:42:49 +00:00
Treehugger Robot
a4a3a5ba42 Merge "bp2build: Add special arch-variant targets." am: 3bc7a1ba47 am: 1f211a9b88 am: 3796dae3e1 am: ebb0afdb18 am: 00e5c25973
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1853859

Change-Id: Id5d02ce87557eeb5310aff74d53c5410cb4bb084
2021-10-13 18:56:28 +00:00
Treehugger Robot
00e5c25973 Merge "bp2build: Add special arch-variant targets." am: 3bc7a1ba47 am: 1f211a9b88 am: 3796dae3e1 am: ebb0afdb18
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1853859

Change-Id: I438581f0541ed6dc4236f9e350bde092dc4353d1
2021-10-13 18:32:05 +00:00
Treehugger Robot
ebb0afdb18 Merge "bp2build: Add special arch-variant targets." am: 3bc7a1ba47 am: 1f211a9b88 am: 3796dae3e1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1853859

Change-Id: I44106be556298680e18b8877f1b4e30001f5324b
2021-10-13 18:17:32 +00:00
Treehugger Robot
3796dae3e1 Merge "bp2build: Add special arch-variant targets." am: 3bc7a1ba47 am: 1f211a9b88
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1853859

Change-Id: I0508155f97fedaa943d0892a10f06fbcff14cc53
2021-10-13 18:01:54 +00:00
Treehugger Robot
1f211a9b88 Merge "bp2build: Add special arch-variant targets." am: 3bc7a1ba47
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1853859

Change-Id: I015e6afd10cd5359b8c03596cde41a665f46165a
2021-10-13 17:46:52 +00:00
Treehugger Robot
3bc7a1ba47 Merge "bp2build: Add special arch-variant targets." 2021-10-13 17:29:36 +00:00
Trevor Radcliffe
93295f27e4 Ignore obsolete lines when converting makefiles
Specifically this skips cases where LOCAL_MODULE_PATH
is TARGET_OUT_OPTIONAL_EXECUTABLES or TARGET_OUT_DATA_APPS.

Test: Added tests
Test: Treehugger
Change-Id: Ib64f22fc3936703c665d07dbb25d8ebf3b9f56c5
2021-10-13 17:16:18 +00:00
Lev Rumyantsev
34581212a4 Support 64-bit arm_on_x86_64
hasArmAndroidArch only checked for 32-bit arm target and thus didn't
work properly on 64-bit only systems.

Test: CtsRsCppTestCases 64-bit only arm on x86
Bug: 194800662
Change-Id: I87332d793dcdd4859766c9067b9fd53f9e4c2516
2021-10-13 09:55:10 -07:00