aboutsummaryrefslogtreecommitdiffstats
path: root/cmd
Commit message (Collapse)AuthorAgeFilesLines
* Allow some duplicates in merged jarsColin Cross2017-09-062-15/+21
| | | | | | | Only take the first MANIFEST.MF or module-info.class file. Test: m -j checkbuild Change-Id: Ifbf9fe272437ef2c2bd51ab4849ac8d7ef37b6fc
* Implement merge_zipsJeff Gaston2017-09-012-0/+198
| | | | | | | | For merging .zip and/or .jar files Bug: 64691570 Test: merge_zips merged.zip in1.zip in2.zip Change-Id: I9a080d25b92a506c9b5451670c4786895b2722ab
* Improve soong_zip filename collisionsColin Cross2017-08-301-62/+71
| | | | | | | | | | Allow filename collisions for directories, which may happen if multiple globs of resources include the same directory names. Continue to report errors if collisions occur between files, and also add checks for collisions between files and directories. Test: manual Change-Id: Iac19fbd325c53fbb41552ea230d813c8dddf9439
* Add soong_zip -D to zip whole directoriesColin Cross2017-08-301-4/+42
| | | | | | | | | Combining the results of a javac command into a jar needs to take a whole directory, add -D to specify a directory to search for all files. Test: m -j checkbuild Change-Id: Id4707189d57b664f0262a0782630f893af397900
* have soong_zip add some extra lines to manifest.mfJeff Gaston2017-08-251-3/+44
| | | | | | | | | | Bug: 64536066 Test: soong_zip --jar -o /tmp/out.zip -C . -l files.list \ && unzip /tmp/out.zip -d /tmp/unzipped \ && cat /tmp/unzipped/META-INF/MANIFEST.MF \ # and look for "Manifest-Version" and "Created-By" Change-Id: I96a3e2032337b93855df720ea0cb2c5364c0b273
* Support in soong_zip to write byte buffers in addition to copying filesJeff Gaston2017-08-251-26/+54
| | | | | | | | | | | This will enable writing a modified manifest without having to create a temporary file first Bug: 64536066 Test: soong_zip --jar -o /tmp/out.zip -C . -l files.list && \ # make sure that the output is binary equal # with and without this patch Change-Id: I559d653e0e72e641e1ee6745924cb835bb0a355b
* Have soong_zip add extended attribute to META-INF in jar modeJeff Gaston2017-08-251-0/+22
| | | | | | | | | | | | | | Bug: 64536066 Test: soong_zip --jar -o /tmp/out.zip -C . -l files.list && \ zipdetails /tmp/out.zip | less \ # and check that the first entry contains the \ # "CAFE" extra attribute as shown below: 0000001E Filename 'META-INF/' 00000027 Extra ID #0001 CAFE 'Java Executable' 00000029 Length 0000 Change-Id: I12c4078591f2ce2afc1af5b9db20393b26601bca
* Add '--jar' flag to soong_zip to move META-INF to the top of the zipJeff Gaston2017-08-242-9/+27
| | | | | | | | | | Bug: 64536066 Test: soong_zip --jar -o /tmp/out.zip -C . -l files.list && \ zipdetails /tmp/out.zip | less \ # and check that the META-INF entries are earlier in \ # the list than other entries Change-Id: Id5c6ea9ce8c3a6fbfb8366db753e6603a076dbf8
* Extract jar-sorting to be accessible to soong_zipJeff Gaston2017-08-242-32/+6
| | | | | | Bug: 64536066 Test: m -j # which runs unit tests Change-Id: I4830bd331c9dab0b1d300a18aefaf25a6af4cfdc
* Have soong_zip not write a data descriptor for non-compressed filesJeff Gaston2017-08-241-1/+4
| | | | | | | | | | | Bug: 64536066 Test: m -j blueprint_tools && cd /tmp && mkdir zip && \ cd zip && touch empty-file && \ echo empty-file > files.list && \ soong_zip -o zip.zip -C . -l files.list && \ jar -xvf zip.zip && echo ok Change-Id: Iac5797aab5282237fa1cc902e6b068a7937c012a
* Revert "Revert "Refactor rate_limit.go for more clarify""Jeff Gaston2017-08-172-88/+126
| | | | | | | | | | | | | | | | | | | | | | | This reverts commit 526416b1e49931b13948d1ccff8d50f2c1b4d178. Figured out a fix for the deadlocks; resubmitting the patch. The first version was deadlocking because the switch statement in zipWriter.write would choose a specific zip entry to start writing, but the individual chunks may not have all necessarily been compressed yet. When each individual chunk was made to require to request its own allocations, the compression of the chunks of the file being currently written could be blocked waiting for memory to be freed by chunks from other files that hadn't yet started being written. This patch is much like the original except it preallocates the memory for the entire file upfront (and happens to use the total file size rather than the compressed size, but I didn't observe that to cause any performance differences). Bug: 64536066 Test: m -j dist showcommands # which runs soong_zip to package everything Change-Id: Id1d7ff415e54d3a6be71188abbdbbbab5a719fcf
* Merge "Fix Finder out path in multiproduct_kati"Jeff Gaston2017-08-181-2/+1
|\
| * Fix Finder out path in multiproduct_katiJeff Gaston2017-08-171-2/+1
| | | | | | | | | | | | Bug: 64363847 Test: ./build/soong/build_test.bash --dist --keep Change-Id: I70b08023b94b5789dc8394651bbac4c49c82787f
* | Merge "Revert "Refactor rate_limit.go for more clarify""Colin Cross2017-08-172-122/+76
|\ \ | |/ |/|
| * Revert "Refactor rate_limit.go for more clarify"Colin Cross2017-08-172-122/+76
| | | | | | | | | | | | | | | | | | | | This reverts commit 69f3b3e9460f4ba41fd82c005311c8c50c88936a. Caused rare deadlocks. Bug: 64536066 Bug: 64813447 Change-Id: Ieb1b931bb2c0afdd8bf8edbfc32c373df3c08d8d
* | Merge "Run the Finder and make its results available to Kati"Jeff Gaston2017-08-172-0/+9
|\ \ | |/ |/|
| * Run the Finder and make its results available to KatiJeff Gaston2017-08-162-0/+9
| | | | | | | | | | | | | | | | | | | | The Finder runs roughly 200ms faster than findleaves.py in aosp, and runs roughly 400ms faster in internal master. Bug: 64363847 Test: m -j Change-Id: I62db8dacc90871e913576fe2443021fb1749a483
* | Refactor rate_limit.go for more clarifyJeff Gaston2017-08-162-76/+122
|/ | | | | | | | | | | | | | | | | | | | | | | | | This wasn't intended to change the behavior, but it does slightly. Previously any requests to acquire memory wouldn't block; only (subsequent) requests for execution would block (if another caller had already consumed the memory quota). Now the requests for memory can also also block. It turns out in a brief test on my computer that soong_zip runs about 10 to 20% faster with this change than without it. The final step involving soong_zip decreased from about 3.6 sec to about 3.3 sec in tests on my computer. When testing the process of re-zipping the contents of angler-target_files*.zip , the time decreased from about 6.3 sec to about 5.3 sec in tests on my computer, and the peak memory usage reported by `top` decreased from about 1.5g to 1g Bug: 64536066 Test: m -j dist showcommands # which runs soong_zip to package everything Change-Id: I0422e4c363c675bb7a93309fac4616c768bfbe8f
* Have soong_zip add entries for ancestor directoriesJeff Gaston2017-08-151-8/+15
| | | | | | | | | | | | | | | | | | | | | Bug: 64536066 Test: When I run: $ mkdir -p a/b/c $ touch a/b/c/d $ soong_zip -o test.zip -d -C . -f a/b/c/d $ zipinfo -1 test.zip a/b/c/ a/b/c/d I should get: a/ a/b/ a/b/c/ a/b/c/d Change-Id: I779bb48062dfaf88a70fab08d8d98d1e366087b3
* Switch to blueprint's microfactoryDan Willemsen2017-07-245-1152/+1
| | | | | | | Bug: 63720725 Test: m -j nothing Test: mkdir o; ../bootstrap.bash; ./soong Change-Id: Id1f8312678f36afd08b49f8511fec3e6e5ba8de2
* Add integration testing infrastructureColin Cross2017-07-141-1/+2
| | | | | | | | | | | | | | | | | | | | | Fix mutator registration for tests to allow different tests in the same package to register different mutators. Allow tests to track the resulting ModuleBuildParams objects to use in assertions, and provide helpers for getting them. For example: config := android.TestConfig(buildDir) ctx := android.NewTestContext() ctx.RegisterModuleType(...) ctx.MockFileSystem(...) ctx.ParseBlueprintsFile("Android.bp") ctx.PrepareBuildActions(config) ctx.Register() // Get the Inputs value passed to the javac rule for the foo module inputs := ctx.ModuleForTests("foo".Rule("javac").Inputs Test: java_test.go Change-Id: I10c82967f5f3586d2c176f169906b571ed82fc73
* microfactory: Sort dependenciesDan Willemsen2017-07-131-0/+1
| | | | | | | | This was causing android/soong/ui/build to rebuild sometimes when it didn't need to. Test: `m -j nothing; grep "B compile" out/.soong_ui.trace` repeatedly Change-Id: I5d33271a7b037f53674a0d312d8da1746eed8eaa
* Add microfactory tracingDan Willemsen2017-07-133-5/+52
| | | | | | Test: m clean; load out/build.trace.gz in chrome://tracing Test: m -j nothing; load again Change-Id: I67d4e006a4bdde593b54c20d6d93a48278fe696d
* Support running soong_ui.bash from anywhere in the treeDan Willemsen2017-07-121-1/+4
| | | | | | | | | | | It will cd to $TOP before running soong_ui itself, so that soong_ui still runs from the top of the tree. ORIGINAL_PWD is saved so that we can reference that later (for example, to move 'mma' implementation into Go). Test: cd system; ../build/soong/soong_ui.bash Test: Set absolute / relative OUT_DIR or OUT_DIR_COMMON_BASE and repeat Change-Id: Icb67a3ee6a3358cca50300755c8953419fc19437
* Make '**' implicitColin Cross2017-06-232-3/+34
| | | | | | | Default to copying all entries in the input zip to the output zip. Test: zip2zip_test Change-Id: I0d70620c621bfeee2b7fe2a64b350b4866ad2877
* Add jar sorting to zip2zipColin Cross2017-06-232-10/+79
| | | | | | | | | | Jars have a strange sorting order; the META-INF/ directory should come first, then META-INF/MANIFEST.MF, then any other files in META-INF/, and then any files outside META-INF. Add a -j argument to zip2zip that sorts using jar ordering. Test: zip2zip_test Change-Id: I80e2bc7e284ef74f6561c26cb6541298834db1bc
* zip2zip: Support sorting globbed arguments, '**'Dan Willemsen2017-06-223-42/+272
| | | | | | | | | | | | | | | When '-s' is passed, any globbed arguments will have their results sorted. When there are multiple arguments, the files will still be inserted in argument order. A bare '**' is now special cased to mean every file in the input zip. This allows zip2zip to sort entire zip files efficiently by using `zip2zip -s -i <> -o <> '**'`. This can be useful if your original zip program used filesystem ordering which was not reproducible. Test: m -j blueprint_tools (new tests pass) Change-Id: Ic3512c5fe14c94c6f3e134296905121d2ff8b58a
* Make absolute OUT_DIR work with sboxJeff Gaston2017-06-121-5/+37
| | | | | | | | Test: make OUT_DIR=/tmp/abspath Test: make OUT_DIR=relative-out Bug: 35562758 Change-Id: I688d5f6117b194440c5d01c1040033b5671187c2
* Easier debugging of sboxJeff Gaston2017-06-091-4/+24
| | | | | | | | | | Cleanup of some failure messages Also, this leaves the temp directory untouched if a declared output was not created Bug: 35562758 Test: make Change-Id: I8ef1315af80eb327752501f12a331dbdf52ba3e9
* Have Soong try to enforce that genrules declare all their outputs.Jeff Gaston2017-06-092-0/+154
| | | | | | | | | | | This causes Soong to put the outputs of each genrule into a temporary location and copy the declared outputs back to the output directory. This gets the process closer to having an actual sandbox. Bug: 35562758 Test: make Change-Id: I8048fbf1a3899a86fb99d71b60669b6633b07b3e
* Add pom2mk, a maven repo -> Android.mk toolDan Willemsen2017-06-072-0/+273
| | | | | | | | | This is still fairly simplistic, but good enough to test some build system changes. Bug: 33381544 Test: run, inspect output Change-Id: Ia5c19570493116dca01cb65605cdf20becf8c1d0
* Prepare multiproduct_kati to run on the build serversDan Willemsen2017-05-221-11/+60
| | | | | | | | | | | | | Adds a -dist argument that will use DIST_DIR to save logs. Also writes a summary of each std.log to stderr on errors, so that the error is more likely to show up in the error reporting. This output is prefixed with "> " to differentiate it from the progress reports from multiproduct_kati itself. Test: multiproduct_kati -only-config Test: DIST_DIR=dist build/soong/build_test.bash -dist (introducing errors) Change-Id: I5005b5f3f200c876bc004dd9b0e01e7b6edf5be2
* Add build_test.sh, split common parts of soong_ui.bashDan Willemsen2017-05-151-0/+88
| | | | | | | | | | Move common microfactory functions to cmd/microfactory/microfactory.bash so that they can be used to build both soong_ui for normal build and multiproduct_kati for build system tests. Test: m -j Test: build/soong/build_test.bash Change-Id: I9512642d846ce54d05a027b6d33a2b3029b3f90b
* Allow specifying a build variantDan Willemsen2017-05-151-1/+3
| | | | | Test: multiproduct_kati --variant userdebug Change-Id: I6548889caf868cad6270110c038753d029247572
* Improve multiproduct_kati outputDan Willemsen2017-05-151-17/+83
| | | | | | | | | It now uses the same output style as ninja, overwriting status lines in smart terminals. Test: multiproduct_kati Test: multiproduct_kati | cat Change-Id: I8db5198ffdc5ebc5503241ac492379753d92978e
* Supported minor features in soong_zipNan Zhang2017-05-021-47/+103
| | | | | | | | | | 1. Added ability to keep the mixed "-f"/"-l" order as same as command-line flags order. 2. Added "-s" flag to specify which target file within zip is stored uncompressed. Test: manual Change-Id: I338b25a7bd6bf1b7e9cc29ad3324575167630fb7
* Don't write output during testsDan Willemsen2017-04-202-6/+7
| | | | | | | Removes the "\nPASS\n" print (since we only strip "PASS\n") Test: m -j blueprint_tools Change-Id: I31abd8474d92af29e1fa4c1ae5a940f6a588336d
* Convert soong_javac_filter to a wrapperColin Cross2017-04-183-22/+126
| | | | | | | | | | Piping the output of javac through a filter makes it hard to capture the exit status. Convert it to a wrapper that executes javac and propagates the exit status. Bug: 36666657 Test: javac_wrapper_test Change-Id: I9b56cc3794023aabc9328138a68830e26e980f97
* Merge "multiproduct_kati: better directory names."Treehugger Robot2017-04-041-4/+6
|\
| * multiproduct_kati: better directory names.Steven Moreland2017-03-291-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Naming directories according to current date. This makes them easier to parse when using the tool multiple time. Also considered: millis := time.Now().UnixNano() / 1000000 name := fmt.Sprintf("multiproduct-%d", millis) Also considered putting separators in the number, but it makes for too long of a directory name. Test: multiproduct_kati Change-Id: I10ac6754094653abf5bf11b04efc3c44905d3c8d
* | Microfactory support for transitive link dependenciesJeff Gaston2017-03-312-19/+51
| | | | | | | | | | | | Bug: 36816202 Test: make -j Change-Id: Idbdf81002ed4c363a2b725905d91ffc204ef3d0e
* | fileslist: hash the content of symlink, not the file it points to.Sen Jiang2017-03-291-11/+19
| | | | | | | | | | | | | | | | | | | | | | | | IsDir() doesn't handle the case where the file is a symlink to a directory, which cause fileslist to crash. The hash is used to validate whether system image is the same, so hashing the content of symlink makes more sense. Bug: 36274890 Test: joule builds Change-Id: I6359418a5b28f8da13f85b01a30a72228fecf4ce
* | Add fileslist.go to calculate hashes in parallelMakoto Onuki2017-03-242-0/+185
|/ | | | | | | Bug: 36274890 Test: Manual Change-Id: I548da5607cf3b993ad21cbb04a57fcbd5bfb7f51
* Added functionality in soong_zip that supports adding root prefix.Nan Zhang2017-03-201-63/+79
| | | | | | | | | | | | | | | Added -P flag in soong_zip: It provided a path prefix which will be added in front after -f/-l was applied with -C. eg. ./soong_zip -o /path1/../ -P a/c -C d/e -f d/e/test.txt zip_dest: a/c/test.txt Bug: b/31676493 Test: go build -a to build a real soong_zip, and test it with real files. Change-Id: Ic924ba252e963ca5847c370f733058888426b696
* Refactor compressWholeFile to take a zipEntryandroid-n-mr2-preview-2Dan Willemsen2017-03-151-18/+5
| | | | | | Test: m -j vts; compare android-vts.zip Test: soong_zip -C ./ -f short_test.sh -f log -o test.zip Change-Id: I9a843c6f8436ecfacc7948915e50f25c04497057
* Preserve executable bit in soong_zipDan Willemsen2017-03-151-2/+10
| | | | | | Bug: 36292596 Test: m -j vts; zipinfo out/host/linux-x86/vts/android-vts.zip Change-Id: If595641544cc387019d93b99e0a7890e0b7a9453
* Fix `dist` if $DIST_DIR/logs doesn't existDan Willemsen2017-03-011-3/+4
| | | | | | Bug: 35886901 Test: rm -rf out; m -j dist Change-Id: I1008d9eef884d60766e35a543e72df5df01d61de
* Updates for the new ckati dropDan Willemsen2017-02-241-2/+1
| | | | | | | | | | | | | We can start removing out directories again in multiproduct_kati, since the opendir bug has been fixed. Add --color_warnings to the Kati command line. Since this is different from Make, take this opportunity to reorder the command line to make more sense. This wasn't done before because kati forces a regen whenever the command line changes. Test: USE_SOONG_UI=true m -j blueprint_tools Change-Id: I5ad03359fbc16db482722946202297c1ae0f2b90
* Don't use runtime.Version() to find the current go versionDan Willemsen2017-02-221-1/+15
| | | | | | | | | That will be the go version at compile time. So read $GOROOT/VERSION, or fall back to executing `$GOROOT/bin/go version` to find the go version currently in GOROOT. Test: Ensure everything rebuilds when switching between go1.8rc2 and go1.8 Change-Id: I8738a7aa249a088b1e0668af260fa3974844dab7
* increase javac_filter line length limit to 2MBColin Cross2017-02-191-0/+4
| | | | | | | | | Some javac wrappers output the entire list of java files being compiled on a single line, which can be very large, set the maximum buffer size to 2MB. Test: pipe the grok build output through soong_javac_wrapper Change-Id: Ib208461dca02ced4959433b7695ec760dc134468
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 13:43:37 +0000