Commit Graph

42399 Commits

Author SHA1 Message Date
Paul Duffin 3261dcee7a Merge "Add package module to sdk snapshot that contains licenses" am: c8aeb00a9c am: d59e0728cf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1702370

Change-Id: I6795d2303adf405b18090f839f979a888b440648
2021-05-12 15:12:11 +00:00
Paul Duffin 7079601939 Merge "Add license modules to the sdk" am: 62fb7438b1 am: f5dae016bb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1699191

Change-Id: I722e55534657acdca79b3484ace8d2773e981020
2021-05-12 15:12:05 +00:00
Paul Duffin 18f6703cd7 Merge "Switch Effective_license_text from []string to Paths" am: fffd98fd16 am: 814d3fffaa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1702369

Change-Id: I0f59ce7cfbf375668e688fc9d67c0628e966b3db
2021-05-12 15:11:59 +00:00
Paul Duffin a25390436b Merge "Move license module processing to GenerateAndroidBuildActions" am: 12f5d04859 am: d2dea2f249
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1699190

Change-Id: Ic0b0ab1b286d9b6389ade952ff99af58fec46be6
2021-05-12 15:11:44 +00:00
Paul Duffin 88a0a1da57 Merge "Add baseline test for license with sdk" am: 0d62615468 am: 9fbe8bb506
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1699189

Change-Id: I3d4e64749c613cd8825388ec772d4d0faf21b73c
2021-05-12 15:11:21 +00:00
Paul Duffin d59e0728cf Merge "Add package module to sdk snapshot that contains licenses" am: c8aeb00a9c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1702370

Change-Id: I07ce0f2f6984c1d7c03caea1a1207c36c0c5cfe2
2021-05-12 14:43:17 +00:00
Paul Duffin f5dae016bb Merge "Add license modules to the sdk" am: 62fb7438b1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1699191

Change-Id: I57a406c5c5f8c01c205c36c6792e3f4764fd82f7
2021-05-12 14:43:03 +00:00
Paul Duffin 814d3fffaa Merge "Switch Effective_license_text from []string to Paths" am: fffd98fd16
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1702369

Change-Id: I26fc1c416cad8025f236cc49dbd4c001f4a1862a
2021-05-12 14:42:49 +00:00
Paul Duffin d2dea2f249 Merge "Move license module processing to GenerateAndroidBuildActions" am: 12f5d04859
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1699190

Change-Id: I5bccbefeb34db8d0b60432c6b978da5127e12011
2021-05-12 14:42:34 +00:00
Paul Duffin 9fbe8bb506 Merge "Add baseline test for license with sdk" am: 0d62615468
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1699189

Change-Id: I41b1eb3945c340ac61cc083ea2b69c1d38182af5
2021-05-12 14:40:04 +00:00
Paul Duffin c8aeb00a9c Merge "Add package module to sdk snapshot that contains licenses" 2021-05-12 13:29:38 +00:00
Paul Duffin 62fb7438b1 Merge "Add license modules to the sdk" 2021-05-12 13:28:45 +00:00
Paul Duffin fffd98fd16 Merge "Switch Effective_license_text from []string to Paths" 2021-05-12 13:28:05 +00:00
Paul Duffin 12f5d04859 Merge "Move license module processing to GenerateAndroidBuildActions" 2021-05-12 13:27:15 +00:00
Paul Duffin 0d62615468 Merge "Add baseline test for license with sdk" 2021-05-12 13:27:08 +00:00
Jingwen Chen 0bf1dcc16a bp2build: remove libc_tzcode from denylist. am: 3950cd6ed4 am: 2700ace254 am: 19c563ed78
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1704770

Change-Id: I2c0f87fb73c124d54db0e4a36c9c8e7b8841ee88
2021-05-12 13:18:56 +00:00
Jingwen Chen 19c563ed78 bp2build: remove libc_tzcode from denylist. am: 3950cd6ed4 am: 2700ace254
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1704770

Change-Id: Idcfc328bac08517c9c56969a303cc3dce7f4526b
2021-05-12 12:56:23 +00:00
Jingwen Chen 2700ace254 bp2build: remove libc_tzcode from denylist. am: 3950cd6ed4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1704770

Change-Id: I74ab40938e180020281545059540570515fcc5a6
2021-05-12 12:40:24 +00:00
Jingwen Chen 3950cd6ed4 bp2build: remove libc_tzcode from denylist.
This now works with --features no_copts_tokenization. With tokenization,
the escaped empty string '\"\"' became an actual empty string '' on the
command line, setting -DWILDABBR to the wrong value.

However, no_copts_tokenization unveiled other problems with Android.bp
flags, such as spaces in existing cflags like
https://cs.android.com/android/platform/superproject/+/master:bionic/libc/Android.bp;l=288;drc=a0a4a6c2967b5b3c02c951ea1145f32ed5564ab9
- this trips up Bazel's copts when generated literally, so the
fix (other than splitting on space and making Soong accept strings that
don't start with dashes as cflags) is to make bp2build split cflags on
spaces before generating them as copts.

Test: bp2build, build bionic/...
Fixes: 186822591
Change-Id: Icf10bd20f6fb81db0b719ca0555fc70c75b91a79
2021-05-12 10:46:15 +00:00
Lukacs T. Berki 56bb083989 Implement configured version_script.
Bug: 186650430
Test: Presubmits.
Change-Id: I3e363ea9254a859dc8f485c9f273f6b3677f7645
2021-05-12 12:36:45 +02:00
Lukács T. Berki 8da487f9e1 Merge "Make @soong_injection usable in standalone builds." am: b9ebb7dfd8 am: 8178b454a3 am: 3114ff6f5a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1703387

Change-Id: Ia5a5510274a97d7528eb7ada81a4ae56a06f25f5
2021-05-12 07:34:54 +00:00
Lukács T. Berki 3114ff6f5a Merge "Make @soong_injection usable in standalone builds." am: b9ebb7dfd8 am: 8178b454a3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1703387

Change-Id: I10f11da584ff914b653a647670cf097f3d27f02e
2021-05-12 07:03:59 +00:00
Lukács T. Berki 8178b454a3 Merge "Make @soong_injection usable in standalone builds." am: b9ebb7dfd8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1703387

Change-Id: Icc34e21f51e3d0801e4b38f201874b4d3c5d11c0
2021-05-12 06:48:54 +00:00
Lukács T. Berki b9ebb7dfd8 Merge "Make @soong_injection usable in standalone builds." 2021-05-12 06:26:31 +00:00
Colin Cross e070c3a26b Always call SetMode in soong_zip
In addition to setting the mode, SetMode also marks the file
as created by Unix, which seems to cause Debian's unzip tool
to handle UTF-8 filenames correctly.

Fixes: 184575223
Test: TestZip
Change-Id: I0e839dc3d27aaa9abced0eb1d3c4c0f8eed3e3c4
2021-05-11 16:14:39 -07:00
Yuntao Xu af557f6488 Merge "Support LOCAL_ENFORCE_USES_LIBRARIES in androidmk" am: 89733a4ce5 am: 197dc43bfd am: 732947b9ab
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1703985

Change-Id: I518241aa73aa87c508ec1eb0064c56fbe446b689
2021-05-11 22:34:03 +00:00
Elliott Hughes 113f08a93f Merge "Use SHT_RELR relocations where possible." am: 4dac3874f1 am: 41f7037e90 am: 52fc6ab060
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1673945

Change-Id: Ia5331b1ec1ebff548a6acc97e8b5c86643c0f336
2021-05-11 22:33:50 +00:00
Yuntao Xu 732947b9ab Merge "Support LOCAL_ENFORCE_USES_LIBRARIES in androidmk" am: 89733a4ce5 am: 197dc43bfd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1703985

Change-Id: I552ac1fefd6da7bbe804f51cb771cfc32b08ddef
2021-05-11 22:17:32 +00:00
Elliott Hughes 52fc6ab060 Merge "Use SHT_RELR relocations where possible." am: 4dac3874f1 am: 41f7037e90
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1673945

Change-Id: I5b8926380a07cfc3c41ebb8e7a94eb83c16d10b6
2021-05-11 22:17:24 +00:00
Yuntao Xu 197dc43bfd Merge "Support LOCAL_ENFORCE_USES_LIBRARIES in androidmk" am: 89733a4ce5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1703985

Change-Id: Ifa4c6ec4fc968470cda091075f47e6d2669aff6e
2021-05-11 21:53:20 +00:00
Yuntao Xu 89733a4ce5 Merge "Support LOCAL_ENFORCE_USES_LIBRARIES in androidmk" 2021-05-11 21:30:21 +00:00
Yuntao Xu c97761e781 Support LOCAL_ENFORCE_USES_LIBRARIES in androidmk
1. add LOCAL_ENFORCE_USES_LIBRARIES support in the androidmk tool;
2. add one test case.

Bug: 187838385
Test: run 'm androidmk'
Test: TreeHugger
Change-Id: Ibdde2a5a58ef45655a3083b592fa21f7fe63d032
2021-05-11 12:39:54 -07:00
Jooyung Han 77f7c44246 packaging: install/package deps if not marked IsHideFromMake
TransitivePackagingSpecs() gathers transitive "install/package"
dependencies.

Previously, IsInstallDepNeeded(depTag) was checked. But, in this way,
some stub libraries which are marked as "HideFromMake()" to avoid
install/package can be gathered.

For example, libdexfile is not installed even if it is one of
libdexfile_support's runtime_libs because it is a stub library and the
impl is provided by "art" apex.

So when gathering transitive deps "IsHideFromMake()" is checked and if
the dep is hidden (so, not supposed to be installed) then the dep
(and its deps) is ignored.

Bug: 187686926
Test: m nothing
Test: m microdroid (libdexfile shouldn't be included in system/lib)
Test: m hosttar (no changes)
Change-Id: I2729001d4c64985cf0f2b37440c2082fe912e6c5
2021-05-11 19:03:25 +00:00
Elliott Hughes 41f7037e90 Merge "Use SHT_RELR relocations where possible." am: 4dac3874f1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1673945

Change-Id: I060512435c2b80ad5409d03b32c5963369a629d5
2021-05-11 18:02:51 +00:00
Elliott Hughes 4dac3874f1 Merge "Use SHT_RELR relocations where possible." 2021-05-11 17:29:39 +00:00
Jaewoong Jung 310e197d6d Merge "Strict updatability linting against dependencies." am: ccbbeb6965 am: 9319584fad am: bcaf0e855b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1702008

Change-Id: Ie02a46af6665bd6158a4bc1acd72be5d129d0854
2021-05-11 16:34:54 +00:00
Jaewoong Jung bcaf0e855b Merge "Strict updatability linting against dependencies." am: ccbbeb6965 am: 9319584fad
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1702008

Change-Id: I9f334ee36a091a02b8df1a7493299675c656ed5a
2021-05-11 16:10:22 +00:00
Andrew Walbran ebd9bc9f01 Merge "Output machine-readable file with all soong keywords." am: ed00a40686 am: 3c004705a6 am: e216f6ddee
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1699938

Change-Id: Ic29cfbf0f454eebd0b92931d5414aa1819bf9315
2021-05-11 15:53:36 +00:00
Jaewoong Jung 9319584fad Merge "Strict updatability linting against dependencies." am: ccbbeb6965
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1702008

Change-Id: I566bd2b6f517dc8441776162e4e8c8a0ff586ee5
2021-05-11 15:51:40 +00:00
Andrew Walbran e216f6ddee Merge "Output machine-readable file with all soong keywords." am: ed00a40686 am: 3c004705a6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1699938

Change-Id: I62521e3b687b4965bc17bdf904d04ce8d3cbea75
2021-05-11 15:28:25 +00:00
Jaewoong Jung ccbbeb6965 Merge "Strict updatability linting against dependencies." 2021-05-11 15:24:06 +00:00
Andrew Walbran 3c004705a6 Merge "Output machine-readable file with all soong keywords." am: ed00a40686
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1699938

Change-Id: I7454f784af7fdd1318bff574c8dee428acee1986
2021-05-11 14:56:53 +00:00
Lukacs T. Berki 3069dd9d71 Make @soong_injection usable in standalone builds.
Test: Presubmits.
Change-Id: I942e627f9f7b7428834258ef3ccefb7f1f5c7606
2021-05-11 16:54:29 +02:00
Andrew Walbran ed00a40686 Merge "Output machine-readable file with all soong keywords." 2021-05-11 14:38:09 +00:00
Treehugger Robot ddcf758f8c Merge "Generate empty classpaths.proto for bootclasspath_fragment.go." am: a556647c50 am: 3e51be492f am: 613e4c502a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1699193

Change-Id: Ia92df6204946e3e28341cd27a75d108b657754cc
2021-05-11 13:44:08 +00:00
Treehugger Robot 613e4c502a Merge "Generate empty classpaths.proto for bootclasspath_fragment.go." am: a556647c50 am: 3e51be492f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1699193

Change-Id: Ia3e193863fffc4222edd3ddc908a5f489f1e7a61
2021-05-11 13:27:02 +00:00
Treehugger Robot 3e51be492f Merge "Generate empty classpaths.proto for bootclasspath_fragment.go." am: a556647c50
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1699193

Change-Id: Idc249094fafaf46cfd0222b7ea9fb81ddb65d259
2021-05-11 13:10:43 +00:00
Treehugger Robot a556647c50 Merge "Generate empty classpaths.proto for bootclasspath_fragment.go." 2021-05-11 12:53:23 +00:00
Andrew Walbran 75bba11bbc Output machine-readable file with all soong keywords.
Test: make, looked at output
Change-Id: Id0427e1a4f04515493c4dadb9e2856518e3a08dd
2021-05-11 11:10:25 +00:00
satayev 9c66e4276a Merge "Move conv_classpaths.proto to packages/modules/common." am: 7b6d059326 am: e5cf47e902 am: 2c7c708d80
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1699942

Change-Id: I8e3d72d2303ea7c37566b296f06ca451258c8f41
2021-05-11 10:47:36 +00:00