Commit Graph

32261 Commits

Author SHA1 Message Date
Tao Bao 36f0b8daeb Merge "releasetools: Use java_path in sign_target_files_apks.py." am: 4a71d500c1
am: dc04f93e39

Change-Id: Id86cdb3f7fdc771b9213d483d89dc6257a2225a5
2016-11-08 23:47:56 +00:00
Tao Bao dc04f93e39 Merge "releasetools: Use java_path in sign_target_files_apks.py."
am: 4a71d500c1

Change-Id: I61400574ac3f7d29906ca571f497554631ecd72d
2016-11-08 23:42:26 +00:00
Tao Bao 4a71d500c1 Merge "releasetools: Use java_path in sign_target_files_apks.py." 2016-11-08 23:31:51 +00:00
Tao Bao e95540e060 releasetools: Use java_path in sign_target_files_apks.py.
Prior to this CL, it was calling the hard-coded "java" although it was
accepting a "--java_path" option.

Also switch OPTIONS.java_args from string to list. Otherwise it won't
work when providing multiple args.

Bug: 32737832
Test: Specify "--java_path=" and "--java_args" when invoking
      sign_target_files_apks.py with "-v". Check the commands being
      called.
Change-Id: Id7ef98e778646d532027434de7fba9b7a104dbd0
2016-11-08 12:48:43 -08:00
Tao Bao aa4d046bb5 Merge "releasetools: compare size between compressed and patch while build otapackage" am: 49758959f2
am: 9242e1f750

Change-Id: I75c3bf233934c9bf8d1313a66c86b620aab8abbd
2016-11-05 00:17:25 +00:00
Tao Bao 9242e1f750 Merge "releasetools: compare size between compressed and patch while build otapackage"
am: 49758959f2

Change-Id: I17b988878cc7ffdfbe490f404c9cd5ab996a8c5f
2016-11-05 00:13:55 +00:00
Tao Bao 49758959f2 Merge "releasetools: compare size between compressed and patch while build otapackage" 2016-11-05 00:09:35 +00:00
Tao Bao 91445e5886 Merge "releasetools: Make BBOTA incremental generation repeatable." am: b9bd78d110
am: e3554167e2

Change-Id: Ibed49f54635a10325f20163d63852f3833dbf9a6
2016-11-04 21:33:15 +00:00
Tao Bao e3554167e2 Merge "releasetools: Make BBOTA incremental generation repeatable."
am: b9bd78d110

Change-Id: I6402481bf300b52d36df1570cceeae6ec3ff4f8f
2016-11-04 21:29:15 +00:00
Tao Bao b9bd78d110 Merge "releasetools: Make BBOTA incremental generation repeatable." 2016-11-04 21:26:13 +00:00
Colin Cross 36418927cd Merge "findleaves.py: prevent recursion into symlink loops" am: 4d8462417d
am: aeaa3ebcfd

Change-Id: I8dc82e2dd7d353a17fa73c612327ad9c0587aad0
2016-11-04 18:21:12 +00:00
Colin Cross 7cb42e1340 findleaves.py: prevent recursion into symlink loops am: 7829ebfebd
am: 7227637308

Change-Id: I989fe81ac6121390f00b6f7509f1919379abaeb2
2016-11-04 18:21:04 +00:00
Colin Cross aeaa3ebcfd Merge "findleaves.py: prevent recursion into symlink loops"
am: 4d8462417d

Change-Id: I9867ab241c20bf6764b20abd58f4efda3a8ba1ef
2016-11-04 18:17:41 +00:00
Colin Cross 7227637308 findleaves.py: prevent recursion into symlink loops
am: 7829ebfebd

Change-Id: Ib0ff185e2798ca57c6c28157a1182e7b4d1ed820
2016-11-04 18:17:35 +00:00
Colin Cross 4d8462417d Merge "findleaves.py: prevent recursion into symlink loops" 2016-11-04 18:09:36 +00:00
Colin Cross 7829ebfebd findleaves.py: prevent recursion into symlink loops
Keep a set of all visited inodes, and prevent recursing into a symlink
to an already visited inode.

Test: m -j
Test: compare `build/tools/findleaves.py --prune=.repo --prune=.git --mindepth=2 --dir=. Android.mk` before and after
Change-Id: Ied14c40d3066ef9f8e8a2b1535f56f7bbbbd0ab6
2016-11-03 14:29:40 -07:00
Colin Cross 168ff79efc Merge "Export variable for device sanitize arch to Soong" am: d778640b0f
am: 81e759e842

Change-Id: I31e391e46e407359ea3c1dc4875839d0c38b2b6c
2016-11-03 07:21:27 +00:00
Colin Cross 81e759e842 Merge "Export variable for device sanitize arch to Soong"
am: d778640b0f

Change-Id: I2e98bdc476179ad990c2a3294fb6c7f56b21115f
2016-11-03 07:18:27 +00:00
Treehugger Robot d778640b0f Merge "Export variable for device sanitize arch to Soong" 2016-11-03 07:12:54 +00:00
Dan Willemsen c10172ef9c Merge "Update combined build.ninja to depend on Soong's build.ninja" am: 77ecb3347b
am: b4b655a7af

Change-Id: I0867e0d6402f95b04a034148562d731869f2a622
2016-11-03 02:48:11 +00:00
Dan Willemsen b4b655a7af Merge "Update combined build.ninja to depend on Soong's build.ninja"
am: 77ecb3347b

Change-Id: Ia9520db5e535a290d713ce87e3dcba73be7327d7
2016-11-03 02:45:12 +00:00
Dan Willemsen 77ecb3347b Merge "Update combined build.ninja to depend on Soong's build.ninja" 2016-11-03 02:39:19 +00:00
Dan Willemsen d4b0504f85 Update combined build.ninja to depend on Soong's build.ninja
For Soong's build.ninja regeneration to work

Bug: 32574042
Test: m -j, add globbed file, m -j
Change-Id: Ie267ea33e8de88275e99330b2d0f147d1e58fa7b
2016-11-02 16:24:52 -07:00
Colin Cross 2361842291 Export variable for device sanitize arch to Soong
Also renames the variable from SANITIZE_ARCH to SANITIZE_TARGET_ARCH,
and makes it only apply to the device.

Bug: 29498013
Test: No change to build.ninja files with m -j SANITIZE_TARGET=address
Change-Id: Ib5f6ab448f5d96d2426c983308136670f9a55b7b
2016-11-02 15:20:25 -07:00
Dan Willemsen 9e7c127da2 Merge "Remove configuration exported from Soong" am: b1e0c2c478
am: c70f550338

Change-Id: I71fd3c40a51074684dde3442c090b1f5992627f3
2016-11-01 17:28:33 +00:00
Dan Willemsen c70f550338 Merge "Remove configuration exported from Soong"
am: b1e0c2c478

Change-Id: I4674044e2dce477fa9ad747eebe8daa1b7824c38
2016-11-01 17:23:59 +00:00
Dan Willemsen b1e0c2c478 Merge "Remove configuration exported from Soong" 2016-11-01 17:07:54 +00:00
Dan Willemsen a73da56314 Merge "Pass global tidy configuration to Soong" am: ca5748fbe1
am: cb4f1fa3db

Change-Id: I8130ffb692bc913549d747047d41929099d29c3e
2016-11-01 01:24:52 +00:00
Dan Willemsen cb4f1fa3db Merge "Pass global tidy configuration to Soong"
am: ca5748fbe1

Change-Id: I69e7e5bf9960025febafe0bafa746b650718283c
2016-11-01 01:22:21 +00:00
Treehugger Robot ca5748fbe1 Merge "Pass global tidy configuration to Soong" 2016-11-01 01:19:00 +00:00
Dan Willemsen 371c403fa8 Merge "Improve dotdot workaround when src begins with '/'" am: 7918e5121a
am: 05b0da9441

Change-Id: Iefac888b97477ce1a5479a5a931108dcfe229aa3
2016-10-31 23:45:14 +00:00
Dan Willemsen 05b0da9441 Merge "Improve dotdot workaround when src begins with '/'"
am: 7918e5121a

Change-Id: I049e8fa30b713f3aceeb1ca579e2550f22c4a10d
2016-10-31 23:42:43 +00:00
Dan Willemsen 7918e5121a Merge "Improve dotdot workaround when src begins with '/'" 2016-10-31 23:39:36 +00:00
Dan Willemsen 425130e958 Remove configuration exported from Soong
Bug: 32244182
Test: build-aosp_angler.ninja is identical before/after (with same env)
Change-Id: Iec2784d1ec5301afe4e2de491dee806551ae3764
2016-10-31 15:48:00 -07:00
Dan Willemsen 96290686bf Pass global tidy configuration to Soong
Bug: 32244182
Test: WITH_TIDY=true mmma -j build/kati
Test: WITH_TIDY=true WITH_TIDY_CHECKS=-*,performance* mmma -j build/kati
Change-Id: Idca86bd114f353449bf80f73d255d7095a99682a
2016-10-31 15:47:49 -07:00
Colin Cross b90bd1c6f9 Merge "Revert "Revert "Check prebuilt sources during checkbuild""" am: 515f43bb6e
am: e402dd8bb8

Change-Id: I2f8ff970f777382b3e60c34268525ab139ee39f5
2016-10-30 22:20:53 +00:00
Colin Cross e402dd8bb8 Merge "Revert "Revert "Check prebuilt sources during checkbuild"""
am: 515f43bb6e

Change-Id: Ia749b34011e02df8ceb9d0fe0e4aba34da743cb1
2016-10-30 22:14:23 +00:00
Colin Cross 515f43bb6e Merge "Revert "Revert "Check prebuilt sources during checkbuild""" 2016-10-30 22:05:17 +00:00
Dan Willemsen c57894c204 Improve dotdot workaround when src begins with '/'
There are some source files in our tree that use some text processing to
find source files, and end up with source file names that look like:

  /../../dir/file.c

This isn't fixed by our dotdot workarounds because the filename doesn't
start with '../', so strip the initial '/' from any source files, since
they are all relative to $(LOCAL_PATH) anyways.

Bug: 32514380
Test: Build internal source with this problem
Test: Compare build-aosp_angler.ninja before/after
Change-Id: If869419c3d3ba35d55f6e19d9332515695e47d24
2016-10-28 16:30:48 -07:00
Chih-hung Hsieh d3242b7ae6 Merge "Do not use multiprocessing.Pool when --processes=1." am: 948ebf5510
am: 85465a39fb

Change-Id: I4c1cf5da920c48d5df0fabdc3ebc9672fa91a3a4
2016-10-28 20:49:05 +00:00
Chih-hung Hsieh 85465a39fb Merge "Do not use multiprocessing.Pool when --processes=1."
am: 948ebf5510

Change-Id: Ia305f1c26706069d8e048340eac9037782f895b7
2016-10-28 20:44:35 +00:00
Chih-hung Hsieh 948ebf5510 Merge "Do not use multiprocessing.Pool when --processes=1." 2016-10-28 20:34:49 +00:00
Colin Cross 136afebf3e Merge "Move perfprofd installation to PRODUCT_PACKAGES_DEBUG" am: 47bfd3422f
am: f22e056df6

Change-Id: Ib7166b8ababdd1c93422e5284a1ba3cc8397480f
2016-10-28 20:15:07 +00:00
Colin Cross f22e056df6 Merge "Move perfprofd installation to PRODUCT_PACKAGES_DEBUG"
am: 47bfd3422f

Change-Id: I427c8ae7893b0a927e410318738450c8358b1219
2016-10-28 20:10:07 +00:00
Treehugger Robot 47bfd3422f Merge "Move perfprofd installation to PRODUCT_PACKAGES_DEBUG" 2016-10-28 20:04:51 +00:00
Chih-Hung Hsieh 63de300094 Do not use multiprocessing.Pool when --processes=1.
Purpose of this change is not to save some execution time,
but to avoid forking another process. In other applications
that use a wrapper to call this python script, it is difficult
to get overwritten file I/O functions work in a subprocess.
So the wrapper will call warn.py with --processes=1.

Test: run "warn.py --processes=1 build.log"
Change-Id: I5998d5c70d81a456c86eb4002f444a4a60135477
2016-10-28 10:53:34 -07:00
Colin Cross 1e28014c78 Move perfprofd installation to PRODUCT_PACKAGES_DEBUG
LOCAL_MODULE_TAGS is deprecated, use PRODUCT_PACKAGES_DEBUG instead.

Test: none
Change-Id: I670147f4fe38b02ccafe01b96d8078502404113c
2016-10-27 15:41:57 -07:00
Colin Cross 01e1b8ff4b Revert "Revert "Check prebuilt sources during checkbuild""
This reverts commit 409ea88c47.

Bug: 32332829
Change-Id: Ifc8a511762cb44b455cc821f5ac712c294c321c6
2016-10-27 22:10:55 +00:00
Colin Cross 8a1ccefa2b Merge "Revert "Check prebuilt sources during checkbuild"" am: 526ddfb172
am: 96fdb76947

Change-Id: I86cb42e00027103cf43709bcbd129d8682b0d3b2
2016-10-26 23:37:16 +00:00
Colin Cross 96fdb76947 Merge "Revert "Check prebuilt sources during checkbuild""
am: 526ddfb172

Change-Id: I2bd28f5b35b27e2339eb2952b9e3acdd6a470773
2016-10-26 23:32:47 +00:00