Commit Graph

29450 Commits

Author SHA1 Message Date
Andreas Gampe 5d558c5f13 Merge "Build: Only use compiled-classes file when available" into nyc-dev
am: 57c3aea442

* commit '57c3aea442bff67e4452eee7ff8f13294fbad34b':
  Build: Only use compiled-classes file when available

Change-Id: I9a3ae7385483f9f5d934d8cd6660c17c57529989
2016-05-23 20:48:00 +00:00
Vikas Marwaha 57c3aea442 Merge "Build: Only use compiled-classes file when available" into nyc-dev 2016-05-23 20:39:56 +00:00
Alex Klyubin c08fc58061 Merge "Improve concurrency for JAR entry inspection requests." am: ac68c28831
am: 304cb0f015

* commit '304cb0f015889334d6f7e75a92cc6ed8c4ce6c52':
  Improve concurrency for JAR entry inspection requests.

Change-Id: I837fbdfdd3d3af654a8cc31ecd89ec0077e1fba1
2016-05-23 19:34:12 +00:00
Alex Klyubin 304cb0f015 Merge "Improve concurrency for JAR entry inspection requests."
am: ac68c28831

* commit 'ac68c28831f3947e47a924cb677b740975dbbc6f':
  Improve concurrency for JAR entry inspection requests.

Change-Id: I144f7c3f60e8a95785fcdd380e98df867a84bd70
2016-05-23 19:31:14 +00:00
Alex Klyubin ac68c28831 Merge "Improve concurrency for JAR entry inspection requests." 2016-05-23 19:26:14 +00:00
Dan Willemsen e48baffb5e Merge "Move to a single clang unknown flags list" am: 06935290ac
am: 315621eee0

* commit '315621eee0a1199b175ab4d251ea617fdb018fd5':
  Move to a single clang unknown flags list

Change-Id: I209bf8b868da7b11d55fc6cf701976ff914a2160
2016-05-23 17:43:38 +00:00
Dan Willemsen 315621eee0 Merge "Move to a single clang unknown flags list"
am: 06935290ac

* commit '06935290ac12d03a5a4f287f4743ada996305235':
  Move to a single clang unknown flags list

Change-Id: Ia02030229a089e531c7258780fb7837240e2b47f
2016-05-23 17:40:42 +00:00
Dan Willemsen 06935290ac Merge "Move to a single clang unknown flags list" 2016-05-23 17:30:18 +00:00
Baligh Uddin ae8784bbc8 Merge commit \'9b4daacaf8f7ce5a534fae524507e4a4f7622ce4\' into nyc-dev
am: 0418406186

* commit '0418406186f67096a3c42fa276799095620e2296':
  Add Oem Props to otatools package

Change-Id: Ib278834d9237965f9f663508ff312fad89ef920a
2016-05-21 00:31:19 +00:00
Baligh Uddin 0418406186 Merge commit '9b4daacaf8f7ce5a534fae524507e4a4f7622ce4' into nyc-dev 2016-05-20 17:27:18 -07:00
Baligh Uddin 9b4daacaf8 Merge commit '6c70b85cb3c75650e5154366fb5e08e3aadf9a50' into mnc-dr1.5-dev 2016-05-20 17:14:04 -07:00
Baligh Uddin 6c70b85cb3 Merge commit \'8c0c5e61498783496eec848da4f2aa4e30fe98b6\' into mnc-dr-dev
am: 275af3429f

* commit '275af3429f3049378862883dc6a0db2701f9311f':
  Add Oem Props to otatools package

Change-Id: I7e26f26d773c1dac31b274b6c7e708aee1537be8
2016-05-21 00:04:37 +00:00
Baligh Uddin 275af3429f Merge commit '8c0c5e61498783496eec848da4f2aa4e30fe98b6' into mnc-dr-dev 2016-05-20 16:59:14 -07:00
Baligh Uddin 8c0c5e6149 Merge commit \'c1937df4b12afecfdfc6a5d3b37f0aaf6ffdda5b\' into lmp-mr1-ub-dev
am: 50cae53b10

* commit '50cae53b10b7e6a18fe6016bd5dc9eaba715545d':
  Add Oem Props to otatools package

Change-Id: I4ca967ea935f4a3a5c709047ca2ed486d196e974
2016-05-20 23:50:56 +00:00
Baligh Uddin 50cae53b10 Merge commit 'c1937df4b12afecfdfc6a5d3b37f0aaf6ffdda5b' into lmp-mr1-ub-dev 2016-05-20 16:44:27 -07:00
Andreas Gampe bbb0b31cf2 Build: Only use compiled-classes file when available
Don't pull in things from frameworks/base when they're not there.

Bug: 28878540
Change-Id: Ida8a5e4e46dc5cd5bdedc4bb66640abb4969e1f3
2016-05-20 13:52:02 -07:00
Baligh Uddin c1937df4b1 Add Oem Props to otatools package
am: 4f8df41cef

* commit '4f8df41ceff7434ece651737b15bf1035f5549e8':
  Add Oem Props to otatools package

Change-Id: I2b5ba1bb090c5144f4ea0b17153352eb31b46e7f
2016-05-20 18:43:25 +00:00
Baligh Uddin 4f8df41cef Add Oem Props to otatools package
Bug: 23967152
2016-05-20 11:29:53 -07:00
Dan Willemsen 02268f01df Move to a single clang unknown flags list
Soong is using a single list of unknown clang flags for all
architectures, instead of the per-architecture list here. Collapse this
down to a single list as well so that it can be verified against the
Soong list, and eventually replaced by the Soong version.

Change-Id: If43cd892105da5155907c05965a74b835920a369
2016-05-19 15:33:54 -07:00
Dan Willemsen 3f6927a862 Merge "Remove (C|CPP|CONLY|LD)FLAGS checked by Soong" am: 15409e8f20
am: c78767f66d

* commit 'c78767f66d06f2edd46e10fcc5c1ee2053565549':
  Remove (C|CPP|CONLY|LD)FLAGS checked by Soong

Change-Id: I9e63f52a421f9a4358887fdb76c055b51d7903ea
2016-05-19 22:20:34 +00:00
Dan Willemsen c78767f66d Merge "Remove (C|CPP|CONLY|LD)FLAGS checked by Soong"
am: 15409e8f20

* commit '15409e8f20195edce9ccda48836082e4c6bad4f8':
  Remove (C|CPP|CONLY|LD)FLAGS checked by Soong

Change-Id: I412ec02d9825f6f6c857df84744b198e7ce9901a
2016-05-19 22:18:04 +00:00
Dan Willemsen 15409e8f20 Merge "Remove (C|CPP|CONLY|LD)FLAGS checked by Soong" 2016-05-19 22:09:46 +00:00
Alan Viverette 88c45e1415 Merge "Add documents-archive to SDK, docs builds" into nyc-dev
am: 88b0d6a63d

* commit '88b0d6a63d8149d14032d298eccde79a6d3079d4':
  Add documents-archive to SDK, docs builds

Change-Id: I2c07f2f20da849174d23dfe6ab5c81008c37c6b1
2016-05-19 19:48:49 +00:00
Alan Viverette 88b0d6a63d Merge "Add documents-archive to SDK, docs builds" into nyc-dev 2016-05-19 19:39:11 +00:00
Baligh Uddin 37cbef1b1c DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu) am: 74da4d6eef am: cea440c2eb am: 9606ea8a43 -s ours
am: 3c42a21466

* commit '3c42a2146612209e7b8eab749cbafe7f0782e942':
  DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu)

Change-Id: I173d5494f192dc907ae5e6db1e6318bfe66b38c4
2016-05-19 16:56:20 +00:00
Baligh Uddin 3c42a21466 DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu) am: 74da4d6eef am: cea440c2eb
am: 9606ea8a43  -s ours

* commit '9606ea8a4306ac2be9b3d9c17ad7dc890cf25170':
  DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu)

Change-Id: Ia925f396973716d5fcd3120a74b0c44ad99a99fc
2016-05-19 16:52:12 +00:00
Baligh Uddin 9606ea8a43 DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu) am: 74da4d6eef
am: cea440c2eb

* commit 'cea440c2ebb8982158adc8bebf3a4cd85a5950fd':
  DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu)

Change-Id: Ia8380c1e5f81d7225baee928ba2a35290aca4f85
2016-05-19 16:47:58 +00:00
Baligh Uddin cea440c2eb DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu)
am: 74da4d6eef

* commit '74da4d6eef1da6490729dfbd069adf913d9aa6fa':
  DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu)

Change-Id: Iefc0f7c90f631d6298931c9426d8edfbb60aa437
2016-05-19 16:43:34 +00:00
Baligh Uddin 74da4d6eef DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu)
otatools.zip is used to release key sign device images.

Bug: 23967152
2016-05-19 08:50:19 -07:00
Andreas Gampe 28efcb6d39 Build: Use phone compiled-classes in core_minimal
am: 695b28f67c

* commit '695b28f67c88b87486911f8881078e7857e989a8':
  Build: Use phone compiled-classes in core_minimal

Change-Id: I3b3a362c17c741994b34a2f70301806eadf9098d
2016-05-19 05:10:55 +00:00
Andreas Gampe 695b28f67c Build: Use phone compiled-classes in core_minimal
Use default phone compiled-classes list to cut down boot image
size on most devices.

Bug: 28026683
Change-Id: I73bb59b792923ebc7549f775085b1c9aed88cc1a
2016-05-18 20:10:43 -07:00
Dan Willemsen dcfa920235 Merge "Windows: Stop adding to GLOBAL_LD_DIRS" am: e23a49157f
am: 84eb1d2cca

* commit '84eb1d2ccad40ecffa989fe0babf1c4a9c589f0a':
  Windows: Stop adding to GLOBAL_LD_DIRS

Change-Id: I4e8de34d50c0ab9e57e2f7c3801b2e1b4d9a981b
2016-05-19 01:26:05 +00:00
Dan Willemsen 84eb1d2cca Merge "Windows: Stop adding to GLOBAL_LD_DIRS"
am: e23a49157f

* commit 'e23a49157f34a3c3f82115a117908d32b14a6262':
  Windows: Stop adding to GLOBAL_LD_DIRS

Change-Id: I8b834feed668c311169ec5da294414f47d4175be
2016-05-19 01:23:22 +00:00
Dan Willemsen 174feb906f Remove (C|CPP|CONLY|LD)FLAGS checked by Soong
At the beginning of every build, Soong has exported its version of these
variables, and has been ensuring that when sorted, the result is the
same. So these variables all have the same flags of the Soong ones, but
may be in different orders. We don't believe any of the remaining order
differences matter. As we remove the Make definitions, the exported
Soong variables will take over.

This only removes lines that change one of these variables:

  [2ND_][CLANG_]HOST_CROSS_GLOBAL_CFLAGS
  [2ND_][CLANG_]HOST_CROSS_GLOBAL_CONLYFLAGS
  [2ND_][CLANG_]HOST_CROSS_GLOBAL_CPPFLAGS
  [2ND_][CLANG_]HOST_CROSS_GLOBAL_LDFLAGS
  [2ND_][CLANG_]HOST_GLOBAL_CFLAGS
  [2ND_][CLANG_]HOST_GLOBAL_CONLYFLAGS
  [2ND_][CLANG_]HOST_GLOBAL_CPPFLAGS
  [2ND_][CLANG_]HOST_GLOBAL_LDFLAGS
  [2ND_][CLANG_]TARGET_GLOBAL_CFLAGS
  [2ND_][CLANG_]TARGET_GLOBAL_CONLYFLAGS
  [2ND_][CLANG_]TARGET_GLOBAL_CPPFLAGS
  [2ND_][CLANG_]TARGET_GLOBAL_LDFLAGS

Many other variables are unnecessary now too, but those will be removed
in another change. For those we can ensure the build.ninja file does not
change, but we expect it to change here due to the ordering differences.

Change-Id: I0bd0778706d02ee27b2784dd8dc6b2c71d37bd3a
2016-05-18 18:10:04 -07:00
Dan Willemsen e23a49157f Merge "Windows: Stop adding to GLOBAL_LD_DIRS" 2016-05-19 01:09:28 +00:00
Dan Willemsen 30296f6b94 Merge "Remove trailing newline from TARGET_C_INCLUDES" am: 6864e3790c
am: cb0bccf423

* commit 'cb0bccf42335b4f389e1e3efa2f8681e9b0b2abe':
  Remove trailing newline from TARGET_C_INCLUDES

Change-Id: Ibdaec09f72aa7831a141e1130700840235569d8b
2016-05-19 00:08:00 +00:00
Dan Willemsen cb0bccf423 Merge "Remove trailing newline from TARGET_C_INCLUDES"
am: 6864e3790c

* commit '6864e3790c80d3044307f0d260cf0e2b962ae82d':
  Remove trailing newline from TARGET_C_INCLUDES

Change-Id: I615050a58cca90291f2c07cae4397a711c69e585
2016-05-19 00:05:26 +00:00
Dan Willemsen 3fe3248c36 Windows: Stop adding to GLOBAL_LD_DIRS
Soong does not have the idea of global linking directories, so move the
windows prebuilt library directory to GLOBAL_LDFLAGS instead.

Change-Id: Ie101146f4682cd85924463aa5acaa46869938e6c
2016-05-18 16:50:46 -07:00
Dan Willemsen 6864e3790c Merge "Remove trailing newline from TARGET_C_INCLUDES" 2016-05-18 23:50:27 +00:00
Dan Willemsen 5baaba771c Remove trailing newline from TARGET_C_INCLUDES
In preparation for comparing with the Soong variable.

Change-Id: I159507757ed7678a33a3c94e6d01d170485e251a
2016-05-18 15:38:04 -07:00
Alex Light 8354ee5e9d Merge "Add fake libart" am: 49a4be8130
am: c7e74a370a

* commit 'c7e74a370aaf3fa6c31e6552b90f6e95fe217d06':
  Add fake libart

Change-Id: I320a4d810a611b59410330ce1c48936d63158705
2016-05-18 21:20:40 +00:00
Alex Light c7e74a370a Merge "Add fake libart"
am: 49a4be8130

* commit '49a4be81304d2292bb6bd67ddaabe759d9e8c273':
  Add fake libart

Change-Id: Iacc59ada5b3323c81a8c70464f5634ab722c4f2b
2016-05-18 21:17:09 +00:00
Alex Light 49a4be8130 Merge "Add fake libart" 2016-05-18 21:05:42 +00:00
Dan Willemsen c7f377721a Merge "Remove (TARGET|HOST)_NO_UNDEFINED_LDFLAGS" am: ac7a7bb0ba
am: 611211acd4

* commit '611211acd40bc02773d27568d4774d8061149c52':
  Remove (TARGET|HOST)_NO_UNDEFINED_LDFLAGS

Change-Id: I6744e92b392c02dfcbe2154d13823a5a0a3b7693
2016-05-18 20:55:07 +00:00
Dan Willemsen 611211acd4 Merge "Remove (TARGET|HOST)_NO_UNDEFINED_LDFLAGS"
am: ac7a7bb0ba

* commit 'ac7a7bb0ba7b864a07ceb159dcd6a8b177866fb3':
  Remove (TARGET|HOST)_NO_UNDEFINED_LDFLAGS

Change-Id: I7e880084b72d90dc4de16fd674692b53b1e67de2
2016-05-18 20:52:31 +00:00
Treehugger Robot ac7a7bb0ba Merge "Remove (TARGET|HOST)_NO_UNDEFINED_LDFLAGS" 2016-05-18 20:45:19 +00:00
Dan Willemsen 8308f506ce Remove (TARGET|HOST)_NO_UNDEFINED_LDFLAGS
We never use it for host modules, and all the target configurations use
the same linker argument. This matches Soong.

Change-Id: Ibcba9a4ce340c7a12306d1fee620a04027c0e292
2016-05-18 12:50:53 -07:00
Alex Klyubin 59fcd79e29 Merge "Uncompress native libs only if they are compressed." into nyc-dev
am: 451b72438e

* commit '451b72438e974a10f3f9062ced5d455d3234e4dd':
  Uncompress native libs only if they are compressed.

Change-Id: I4c680cfb228774ce93e75c644e7eee5c40988399
2016-05-18 16:25:46 +00:00
TreeHugger Robot 451b72438e Merge "Uncompress native libs only if they are compressed." into nyc-dev 2016-05-18 16:17:18 +00:00
Alex Light 60c7fd15a8 Add fake libart
Bug: 27775991

Change-Id: I54cbdf2340dcfdd9b3973d9d10c8bd94492736fb
(cherry picked from commit 6da74d8f1f)
2016-05-18 07:58:05 -07:00