Commit Graph

29836 Commits

Author SHA1 Message Date
Baligh Uddin 4d60bb83bb DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu) am: 74da4d6eef am: cea440c2eb am: 9606ea8a43 -s ours am: 3c42a21466
am: 37cbef1b1c

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

Change-Id: I36789c7088d5f506279abab189fa2c32ac04f4d0
2016-05-19 17:00:37 +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
Android Build Merger (Role) 11c776d388 Merge "Build: Use phone compiled-classes in core_minimal am: 695b28f67c am: ea33f4f768" into nyc-mr1-dev-plus-aosp 2016-05-19 05:14:16 +00:00
Andreas Gampe e98ef11300 Build: Use phone compiled-classes in core_minimal am: 695b28f67c
am: 28efcb6d39

* commit '28efcb6d39c065da8831e542793d3ddf10c4d4c1':
  Build: Use phone compiled-classes in core_minimal

Change-Id: I83b72249a82c8a1992718050de65048e212da3ce
2016-05-19 05:13:56 +00:00
Andreas Gampe 1659ff924d Build: Use phone compiled-classes in core_minimal am: 695b28f67c
am: ea33f4f768

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

Change-Id: Iffaa23320311c6e7e97b8088433db3d3ce040dc0
2016-05-19 05:13:56 +00: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 ea33f4f768 Build: Use phone compiled-classes in core_minimal
am: 695b28f67c

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

Change-Id: I00488cf31df5b997de619656dd7541788747fb18
2016-05-19 05:10:54 +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 caac8033f8 Merge "Windows: Stop adding to GLOBAL_LD_DIRS" am: e23a49157f am: 84eb1d2cca
am: dcfa920235

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

Change-Id: Ieeb6f2894a4d7b419d5424193a29927af3974bb8
2016-05-19 01:28:57 +00: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 e23a49157f Merge "Windows: Stop adding to GLOBAL_LD_DIRS" 2016-05-19 01:09:28 +00:00
Dan Willemsen 0af09cfa3d Merge "Remove trailing newline from TARGET_C_INCLUDES" am: 6864e3790c am: cb0bccf423
am: 30296f6b94

* commit '30296f6b9432b3fff26544ec6a4c03592c372030':
  Remove trailing newline from TARGET_C_INCLUDES

Change-Id: I25b1f83a179792608c34323c1d776cd37fbfd806
2016-05-19 00:16:11 +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
Tao Bao 5b195bf082 Merge "Revert "Setting PLATFORM_VERSION(_CODENAME)? to NMR1"" into nyc-mr1-dev
am: dd24d65d2f

* commit 'dd24d65d2fb563d30db175ada8230978e81ba27f':
  Revert "Setting PLATFORM_VERSION(_CODENAME)? to NMR1"

Change-Id: Ib9f4de25f04147dffd2ae67e35125706a8132a78
2016-05-18 22:09:42 +00:00
Tao Bao dd24d65d2f Merge "Revert "Setting PLATFORM_VERSION(_CODENAME)? to NMR1"" into nyc-mr1-dev 2016-05-18 21:59:48 +00:00
Alex Light 1313e5416a Merge "Add fake libart" am: 49a4be8130 am: c7e74a370a
am: 8354ee5e9d

* commit '8354ee5e9d6ac7b61da04c47ce8483167f17f44d':
  Add fake libart

Change-Id: Idb6a2b6c2960895f7f509bfae24f23091312f270
2016-05-18 21:22:27 +00: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 6a08107d2a Merge "Remove (TARGET|HOST)_NO_UNDEFINED_LDFLAGS" am: ac7a7bb0ba am: 611211acd4
am: c7f377721a

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

Change-Id: I8917b7238f15eb1610dca4ec4a900fcde378d5f8
2016-05-18 20:57:41 +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
Tao Bao 295ad1f1f1 Revert "Setting PLATFORM_VERSION(_CODENAME)? to NMR1"
This reverts commit 439971af5d.

Bug: 28713307
Bug: 28817009
Change-Id: I96c9ec9e3f1be6d68eb77df596707568e344a2fc
2016-05-18 12:22:33 -07:00
Android Build Merger (Role) 550fc85425 Merge "Merge "Uncompress native libs only if they are compressed." into nyc-dev am: 451b72438e am: 59fcd79e29" into nyc-mr1-dev-plus-aosp 2016-05-18 16:28:34 +00:00
Alex Klyubin b86cf69d0e Merge "Uncompress native libs only if they are compressed." into nyc-dev am: 451b72438e
am: 59fcd79e29

* commit '59fcd79e29e9418b02f6ba3fbbbd3e2e45eb3785':
  Uncompress native libs only if they are compressed.

Change-Id: I1164c2e43eaf3c0d2d66887174ebf2eda70d5c2a
2016-05-18 16:28:21 +00:00
Alex Klyubin 0ef2d2f6c9 Merge "Uncompress native libs only if they are compressed." into nyc-dev am: 451b72438e
am: eea3802b2c

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

Change-Id: I7ccabcd02062d8e355779c6eac893d87d8f108c6
2016-05-18 16:28:20 +00:00
Alex Klyubin eea3802b2c 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: I9b4f21468db91955b021c744e83efba8b126dc0e
2016-05-18 16:25:46 +00: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
Dan Willemsen 3e1e237986 Merge "Remove make variables exported from Soong" am: 30b57cd7d5 am: f85807f794
am: 7ec97fdc16

* commit '7ec97fdc1627c48ab7bb161f273aaeba33c850d1':
  Remove make variables exported from Soong

Change-Id: I5007f9293791657245b4ddc38cff691487f43b52
2016-05-18 00:45:35 +00:00
Dan Willemsen e0cb1eeeb7 Merge "Pass BUILD_HOST_static to Soong" am: 3b0990cbdc am: 700b0f868e
am: adf18a8836

* commit 'adf18a8836b596829435b3f3ec6a47674894faa9':
  Pass BUILD_HOST_static to Soong

Change-Id: If8bce1964ec29b7094a824ce8901fec49abcdda0
2016-05-18 00:45:34 +00:00
Dan Willemsen 7ec97fdc16 Merge "Remove make variables exported from Soong" am: 30b57cd7d5
am: f85807f794

* commit 'f85807f794266ccebbcba8aaf2732b1fb945519d':
  Remove make variables exported from Soong

Change-Id: I453366e23996f4b68acc5367146829050f00798e
2016-05-18 00:43:02 +00:00
Dan Willemsen adf18a8836 Merge "Pass BUILD_HOST_static to Soong" am: 3b0990cbdc
am: 700b0f868e

* commit '700b0f868e8200fb5c7c30b35155867606229247':
  Pass BUILD_HOST_static to Soong

Change-Id: I0fddac56a5bf4feb5e5049b96c7d75912eb0d021
2016-05-18 00:43:01 +00:00
Dan Willemsen f85807f794 Merge "Remove make variables exported from Soong"
am: 30b57cd7d5

* commit '30b57cd7d5459c69fbd4332b988b5e636b529f4d':
  Remove make variables exported from Soong

Change-Id: I2b7a6baf5d8a8b3b0bb52e8fc4b16a5616f8f939
2016-05-18 00:40:31 +00:00
Dan Willemsen 700b0f868e Merge "Pass BUILD_HOST_static to Soong"
am: 3b0990cbdc

* commit '3b0990cbdc941b584fb3000f76607c2a8065b603':
  Pass BUILD_HOST_static to Soong

Change-Id: I8292e35b7ca3fe14133b8675dbf8d6c54736e5aa
2016-05-18 00:40:30 +00:00
Dan Willemsen 30b57cd7d5 Merge "Remove make variables exported from Soong" 2016-05-18 00:36:46 +00:00
Treehugger Robot 3b0990cbdc Merge "Pass BUILD_HOST_static to Soong" 2016-05-18 00:33:07 +00:00
Dan Willemsen cba1557476 Pass BUILD_HOST_static to Soong
Change-Id: I0ac43a1dedf20e5251e05f12d120d0e6e2e1b1ee
2016-05-17 16:40:03 -07:00