Bob Badour
e5b7a4205e
Fix copy+paste error
...
Fix declare-copy-target-license-metadata
Test: m droid reportmissinglicenses
Change-Id: I5c8ee1109f9b83232bf66218d44ed05f97377a98
2022-12-01 17:56:33 -08:00
Colin Cross
af7ac3986e
Add basic musl support to make
...
There are still devices that set BUILD_BROKEN_USES_BUILD_HOST_* and
build host modules in Make. Add basic support for building against
libc_musl in Make when USE_HOST_MUSL is set.
Bug: 258535366
Test: build a host tool defined in Android.mk file in internal branch
Change-Id: I9150be749bbeaac2ac5a33b2cf915004aa3033df
2022-11-09 16:40:25 -08:00
Cole Faust
6a75c4f782
Delete java-layers.py
...
There are no usages of LOCAL_JAVA_LAYERS_FILE,
and java-layers.py was written in python 2.
Bug: 203436762
Test: Presubmits
Change-Id: I1be0f2547757a853e20811f28529479487037e94
2022-10-24 18:15:54 -07:00
Bob Badour
4f4c75fba9
Add module name argument to build_license_metadata.
...
Test: m droid dist
Change-Id: I40b9f403a3d17cc202844f4cebf336de40e5defe
2022-10-13 13:50:35 -07:00
Bob Badour
54b325df14
Normalize target path for license dependencies.
...
If not normalized the same as declare-license-metadata, two rules get
generated instead of one rule with both license text and deps.
Test: m droid dist
Test: build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=sdk TARGET_BUILD_VARIANT=userdebug sdk dist sdk_repo
Change-Id: I3a8f2d3825c8c0183049fa12b14ace9b54066a01
Merged-in: I3a8f2d3825c8c0183049fa12b14ace9b54066a01
2022-09-13 17:21:40 +00:00
Bob Badour
28078172fe
Put host license metadata in OUT_DIR.
...
Test: m droid dist
Test: build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=sdk TARGET_BUILD_VARIANT=userdebug sdk dist sdk_repo
Change-Id: I9f5d9c1b70eb8469031d49818c32770dcf34fad2
Merged-in: I9f5d9c1b70eb8469031d49818c32770dcf34fad2
2022-09-13 17:20:20 +00:00
Yihan Dong
9b75c9ee1a
Assign each xts test package a copy license metadata
...
Use a copy license metadata instead of module_license_metadata to make each xts test package names shown in the final xts notice file.
Test: m gts reportmissinglicenses
Bug: 245474938
Change-Id: Ic5e28763bc4e8448d3e04a80e89db147387164a6
2022-09-07 08:12:37 +00:00
Greg Kaiser
85518aceab
Add project specific definitions.mk files
...
Just like we do with build/tasks/*.mk, we also look for project
specific definitions.mk files.
Test: TreeHugger
Bug: 243024627
Change-Id: I7f07546582eb02bba245a1f927a11efc1ddc3c6f
2022-08-18 12:22:15 -07:00
Treehugger Robot
79e45e727a
Merge "Append built and installed when copying metadata." am: 3fe9459268
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2169434
Change-Id: Ib2e6411981a213d7e477e105d8efd6783c346f07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 17:47:13 +00:00
Bob Badour
04fbe29669
Append built and installed when copying metadata.
...
Soong doesn't always have the built and installed available.
Bug: 239638693
Test: m droid dist
Change-Id: Id18201da488e3b16d60957c9a298a52345595c5b
2022-07-29 17:16:25 -07:00
Anton Hansson
ce02daa32b
Merge "Fix typo" am: 0f079826a1
am: a00e17c412
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2129256
Change-Id: I560cbea327b27a96639d1b7a49a6d149da0cad58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 13:46:30 +00:00
jiajia tang
7c8dd8c3d4
Fix typo
...
As title
Signed-off-by: jiajia tang <tangjiajia@xiaomi.com>
Change-Id: I40b155ceed8e88fecf25da5dd13a2fb146faf263
2022-06-21 00:21:45 +00:00
Treehugger Robot
67fa5b53f4
Merge "Revert "Revert "Revert "Revert "Create lists of projects to share per dist target""""" am: 6f30351970
am: 7660d6a3a7
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2124807
Change-Id: I0b6ebdce2ed8243bfed7c7ef1f19e37ceebaf367
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 17:01:46 +00:00
Bob Badour
d227fac95b
Revert "Revert "Revert "Revert "Create lists of projects to share per dist target""""
...
This reverts commit 398bd87950
.
Reason for revert: Rolling forward again without 'all' target.
Bug: 151177513
Bug: 210912771
Bug: 235333302
Bug: 232138105
Test: build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=aosp_coral_hwasan TARGET_BUILD_VARIANT=userdebug droid dist with-license platform_tests continuous_instrumentation_tests continuous_native_tests
Test: tapas google-tradefed-all && m dist
Change-Id: I1e5f5639ebf1fa61060124a5183f6f0a2ece04b5
2022-06-14 11:33:54 -07:00
Treehugger Robot
e759d23d01
Merge "Revert "Revert "Revert "Create lists of projects to share per dist target"""" am: 6ebfaa453b
am: 388494bd87
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2124432
Change-Id: Iccbe21894f0f7d1098f87f9f512fe5226a0eb67a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 09:48:18 +00:00
Bob Badour
398bd87950
Revert "Revert "Revert "Create lists of projects to share per dist target"""
...
This reverts commit 82040d9882
.
Reason for revert: Advised to switch to using TARGET_BUILD_APPS
Change-Id: If56a1fceb5da66b90b7b0ec2275ec429661515b4
2022-06-14 00:03:23 +00:00
Treehugger Robot
32fcbf59bb
Merge "Revert "Revert "Create lists of projects to share per dist target""" am: e25ddc0453
am: f4cf61e9b8
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2066749
Change-Id: Ib304d6442d31e4bc70b4a1a0a6fdea3ea7e2a2d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 20:30:49 +00:00
Bob Badour
82040d9882
Revert "Revert "Create lists of projects to share per dist target""
...
This reverts commit 59e4951021
.
Reason for revert: Attempt to roll forward again.
Test: m droid dist reportmissinglicenses
Change-Id: Ibf5a9869d03726e279fb23bf68ca66547b972138
2022-06-08 18:49:20 -07:00
Treehugger Robot
f6acd8f004
Merge "Create license metadata for copied targets." am: 1f0c3583a6
am: 62f582272d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2109383
Change-Id: Ia76ed06e5021d530bcba851df619048edede15f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-03 03:39:57 +00:00
Bob Badour
ba3372439f
Create license metadata for copied targets.
...
Bug: 213388645
Test: m cts dist reportmissinglicenses
Change-Id: I43043e5e7b80d9f3210d6498c215846aec761add
2022-06-02 15:43:08 -07:00
Colin Cross
67e5e7f150
Merge "Remove HOST_DALVIK_*" am: 544aedda27
am: 265c1cc9a3
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2059991
Change-Id: I2ab5dfd7d579f9b141c4e6022f40034a1c6ccfaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 16:54:18 +00:00
Colin Cross
a9203e6d87
Remove HOST_DALVIK_*
...
There are no more BUILD_HOST_DALVIK_* modules, remove the host dalvik
support. The equivalent support in Soong just copies the device dex
file to the host dalvik location.
Test: m checkbuild
Change-Id: I4bcf916518317b28d3217994b2fe9ee95d7f50d6
2022-05-11 08:17:45 -07:00
Treehugger Robot
bbc004ce98
Merge "Replace DEX_FLAGS by flags for D8 and R8." am: b27140daa0
am: dbcc7e454b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2059747
Change-Id: I3f3dcc83ffae4c3e9c837693784c74872e991ff6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:05:04 +00:00
Ian Zerny
8deeb2b64e
Replace DEX_FLAGS by flags for D8 and R8.
...
Bug: b/227746536
Test: manual
Change-Id: Ic3cb8feb7a09d690ecd309162236e49a8d1e52c6
2022-04-25 11:02:41 +02:00
Treehugger Robot
0afb5008fd
Merge "Use the new R8/D8_FLAGS vars" am: 8ecc6369f0
am: 24d5aac91d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2070111
Change-Id: I25b9bf3c2e54b0f0140c6cd935a63f5704304c8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 07:49:48 +00:00
Jared Duke
1410f684f6
Use the new R8/D8_FLAGS vars
...
Propagate the new D8/R8 JVM flags vars that were formerly combined in
DEX_FLAGS.
Bug: 205303544
Test: time m
Change-Id: Ifc6051cd9422b3f5c52322833d9a7f5e8263f857
2022-04-21 18:24:55 +00:00
Bob Badour
e0013ca046
Merge "Revert "Create lists of projects to share per dist target"" am: f4ad50eeb6
am: 7b536df914
am: 10c3f0496b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2065621
Change-Id: I8a0377f718b43aae89e1ccf6066c590b57b99afb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-15 18:23:54 +00:00
Bob Badour
59e4951021
Revert "Create lists of projects to share per dist target"
...
This reverts commit 1fd4bda634
.
Reason for revert: Causes flaky build breakages
Bug: 229319921
Change-Id: I82e660e95c8d4d72b88d2de58d82e0d4be901869
2022-04-15 17:29:26 +00:00
Treehugger Robot
9bad3e7e91
Merge "Create lists of projects to share per dist target" am: 746806b3bb
am: 8a4f747caf
am: 87a7663b8d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2064290
Change-Id: I0e5ee56ac9ea244ef90d78e60a5717325f3cac9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 23:20:46 +00:00
Bob Badour
1fd4bda634
Create lists of projects to share per dist target
...
Bug: 151177513
Bug: 213388645
Bug: 210912771
Test: m droid dist reportmissinglicenses
Change-Id: I23ee3a983c205ee2a62e47edc2039b7cc713c420
2022-04-13 11:27:59 -07:00
Treehugger Robot
d816479292
Merge "Remove unused combine-notice-files macro." am: 2f6aa08f69
am: 5324ea0ca6
am: 2de37f9424
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2055032
Change-Id: I2751ba90417c8960ab5539f2fe181c66b4c69b15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 20:43:39 +00:00
Bob Badour
6259a09b7a
Remove unused combine-notice-files macro.
...
Bug: 151177513
Bug: 213388645
Bug: 210912771
Test: m cts reportmissinglicenses
Test: m droid reportmissinglicenses
Change-Id: I4cddf9a381a1258bdc2b1b42be72c447df10d234
2022-04-07 22:04:03 -07:00
Colin Cross
e03e64a4c9
Merge "Revert "Revert "Produce mappings of hashes to elf symbols and r8 dictionaries""" am: d8cf9a5a30
am: 9bb87d3f51
am: e64f092723
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2056437
Change-Id: Ibfb3b0f9bc648ef0d68e93841daf65b2a788a4b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 22:47:57 +00:00
Colin Cross
d8cf9a5a30
Merge "Revert "Revert "Produce mappings of hashes to elf symbols and r8 dictionaries"""
2022-04-06 18:20:43 +00:00
Colin Cross
ac7febc9c7
Revert "Revert "Produce mappings of hashes to elf symbols and r8 dictionaries""
...
This reverts commit 59ecb9e016
.
Reason for revert: symbols_map is fixed to ignore non-elf files
Bug: 218888599
Change-Id: I88654b2dba3dfb9ab2809b0555544277279f345d
2022-04-06 01:11:20 +00:00
Colin Cross
92ead00c5c
Merge "Revert "Produce mappings of hashes to elf symbols and r8 dictionaries"" am: cba35df61b
am: e662f2e4db
am: 1a652183f3
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2055033
Change-Id: I519ae7270d3b279230ce890e64de475fafa24820
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-05 20:44:54 +00:00
Colin Cross
cba35df61b
Merge "Revert "Produce mappings of hashes to elf symbols and r8 dictionaries""
2022-04-05 17:53:24 +00:00
Colin Cross
59ecb9e016
Revert "Produce mappings of hashes to elf symbols and r8 dictionaries"
...
This reverts commit 3570b3ed86
.
Reason for revert: b/228195288
Bug: 218888599
Change-Id: I17b38ca1b6f8940d682f2782515bfd5f8db1ce58
2022-04-05 17:47:27 +00:00
Colin Cross
d651900385
Merge "Produce mappings of hashes to elf symbols and r8 dictionaries" am: 229fb33e39
am: 47e2aed61d
am: 25681b47af
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2035523
Change-Id: I6a9fd470c2bece57a6be2eec7be4156a59ff63bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-05 15:28:29 +00:00
Colin Cross
229fb33e39
Merge "Produce mappings of hashes to elf symbols and r8 dictionaries"
2022-04-05 14:16:16 +00:00
Treehugger Robot
b9600415f5
Merge "Support more dependencies for license metadata." am: d17518474a
am: e13c9771a6
am: c8e5998100
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2043296
Change-Id: If82e7222c2d8ee7fc850d7d8c4c1b218d9b91a79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-05 01:57:20 +00:00
Colin Cross
3570b3ed86
Produce mappings of hashes to elf symbols and r8 dictionaries
...
Run the symbols_map tool on each unstripped binary and proguard
dictionary while copying it to produce a textproto that maps the
hash to the symbol/dictionary file location. Combine the textprotos
into a mapping file when producing the zipped build artifacts.
Bug: 218888599
Test: m dist
Change-Id: I78997e2f3b631ed74213903cc8e72415b2d7eee0
2022-04-04 16:04:52 -07:00
Bob Badour
061d7e6f2b
Support more dependencies for license metadata.
...
Bug: 213388645
Test: m vts reportmissinglicenses
Change-Id: I8de06c802d2397d02d9c2152f764b1d5ea2f795c
2022-04-01 16:02:40 -07:00
Treehugger Robot
0e9fbfd393
Merge "Support OUT_DIR for license graph." am: bc8d61f17b
am: 443a7b25e3
am: f74478b33b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2036930
Change-Id: I18d97926c690708b1c889d8e9cabe1ee97e15382
2022-03-24 05:07:20 +00:00
Treehugger Robot
bc8d61f17b
Merge "Support OUT_DIR for license graph."
2022-03-24 00:43:58 +00:00
Bob Badour
63a21c9d3d
Merge "Test suite notices using dependencies." am: d8f8910780
am: 70c11407ed
am: b751e56046
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2032649
Change-Id: I6cb435a1c12b8eebcdff3ebd236543b1b295a11e
2022-03-23 23:32:41 +00:00
Bob Badour
d8f8910780
Merge "Test suite notices using dependencies."
2022-03-23 21:14:59 +00:00
Bob Badour
c778e4cba4
Support OUT_DIR for license graph.
...
Bug: 226066987
Test: OUT_DIR=/tmp/outdir m all listshare checkshare htmlnotice rtrace dumpgraph dumpresolutions compliancenotice_bom compliancenotice_shippedlibs
Test: OUT_DIR=/tmp/outdir m /tmp/outdir/target/product/bonito/obj/NOTICE.xml.gz
Test: m all listshare checkshare htmlnotice rtrace dumpgraph dumpresolutions compliancenotice_bom compliancenotice_shippedlibs
Test: m out/target/product/bonito/obj/NOTICE.xml.gz
Change-Id: I6282c647a389c5935d5ce7c79193f86d32c76365
2022-03-23 14:12:12 -07:00
Bob Badour
42f00c7b61
Test suite notices using dependencies.
...
Switch from combine-notice-files to html-notice-rule and
text-notice-rule.
Bug: 151177513
Bug: 213388645
Bug: 210912771
Test: m cts reportmissinglicenses
Change-Id: I59d78553f15f0fd6be87228c933693b63e2ebf04
2022-03-23 11:18:39 -07:00
Colin Cross
2cd6b0fbf6
Merge changes I084158ff,I2f2ba905,Ic9af8761 am: ce3c48db58
am: e4c2fc9847
am: da2b3b3a5d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2035163
Change-Id: I3023baf758c90d516f0787da2c13d6a9069aeeaa
2022-03-23 00:06:08 +00:00