Commit graph

953 commits

Author SHA1 Message Date
Tim Kilbourn
428854952e Add wifi-service to PRODUCT_PACKAGES.
Bug: 13622394
Change-Id: Ifa186db4b804bcb123b26324978c7a1ad986c1e2
2014-03-24 23:45:52 -07:00
Colin Cross
cf1f9d2d67 fix bad merge conflict resolution
Change-Id: I56c885df873ff6281f62a5c4e5d4db19138b591d
2014-03-21 17:41:26 -07:00
Colin Cross
f2b60c0f80 resolved conflicts for merge of f8e4d1b7 to master
Change-Id: I387a979ac119fc9423af6f07b6700c85384aeb94
2014-03-21 17:25:08 -07:00
Adam Hampson
e3290e9e46 Merge "move libbcc from core_base to core_minimal" 2014-03-21 21:31:02 +00:00
Lajos Molnar
3d402686ca Merge "stagefright: use media_codecs_google*.xml files" 2014-03-21 21:15:32 +00:00
Adam Hampson
ce91d3c0c0 move libbcc from core_base to core_minimal
Bug: 13528787

Change-Id: If8b531f71bf3831e4d3d59e2a2bc04dd72f4a8b1
Signed-off-by: Adam Hampson <ahampson@google.com>
2014-03-21 12:40:57 -07:00
Mark Renouf
50449c9cfa am 37f3c5cc: Fix removal of PRODUCT_PREBUILT_WEBVIEWCHROMIUM
* commit '37f3c5cc1de11f7b316c2d03ed8f6951d4f95372':
  Fix removal of PRODUCT_PREBUILT_WEBVIEWCHROMIUM
2014-03-21 16:22:07 +00:00
Mark Renouf
37f3c5cc1d Fix removal of PRODUCT_PREBUILT_WEBVIEWCHROMIUM
Change-Id: I8a6bad054ac22592f0d341bb3ebbe4cc74828698
2014-03-21 11:50:35 -04:00
Ying Wang
636dc20d1a resolved conflicts for merge of ad495272 to master
Change-Id: I6b47768f44b1a6136ca31936e19f943ee72cb627
2014-03-20 15:24:52 -07:00
Ying Wang
46d69e9914 am 9ce34617: am 4f9d6f57: Merge "Fix embedded build"
* commit '9ce34617a001338093b0de85443925a37a967f0d':
  Fix embedded build
2014-03-20 19:36:32 +00:00
Ying Wang
8c7e74ee05 Fix embedded build
1) Disable dexpreopt if DALVIK_VM_LIB isn't set up by the product.
2) DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES is moved to config.mk,
for it's only decided by target arch.
3) Move Java module input from embedded.mk to base.mk.

Change-Id: Ife70b0cd8cee2e5c92f356c808affa56f494b49a
2014-03-20 12:13:10 -07:00
Lajos Molnar
f40956fbbf stagefright: use media_codecs_google*.xml files
Bug: 13549114
Change-Id: I25d6344c78da152f394fa7b4855a2eb61008afc6
2014-03-19 17:39:39 -07:00
Geremy Condra
acd99d9367 Merge "Add verity build targets for verity-enabled devices." 2014-03-18 22:23:48 +00:00
Geremy Condra
0ac3b5d8e5 Add verity build targets for verity-enabled devices.
Change-Id: Ia9fa8e7ebe01b63e50d61071d36165a6a820c6c4
2014-03-17 20:18:49 -07:00
Eric Laurent
2044c09202 Merge "move audio policy service to a separate library" 2014-03-18 00:14:24 +00:00
Andy McFadden
68e1654aed Remove "screenshot"
Remove the old "screenshot" utility, which has been replaced
by "screencap".

Change-Id: I5bad1fdad308339e4a16ce92f2a65e2437b1be65
2014-03-11 13:51:57 -07:00
Eric Laurent
20d5476f7f move audio policy service to a separate library
Change-Id: I2612253148238e0cce12bd5a0effcb790e86e5f0
2014-03-06 14:42:00 -08:00
Victoria Lease
c9b7f3d6a1 am 3c14d21a: am 14a5be01: am 4e965ac6: am 38626e63: Merge "Add external/google-fonts/*/fonts.mk."
* commit '3c14d21a2a62398322479e015fecdb43652fb331':
  Add external/google-fonts/*/fonts.mk.
2014-03-03 23:49:36 +00:00
Victoria Lease
14a5be0174 am 4e965ac6: am 38626e63: Merge "Add external/google-fonts/*/fonts.mk."
* commit '4e965ac6f56de2071a381ed37e4a9899062e5ab2':
  Add external/google-fonts/*/fonts.mk.
2014-03-03 23:42:48 +00:00
Victoria Lease
8da3a02c1f Add external/google-fonts/*/fonts.mk.
Bug: 12384866
Change-Id: I30abb9fb962a59b46be1cb9f12b099ea29850a50
2014-02-28 15:35:07 -08:00
Mark Salyzyn
b8424c7925 am 4c65c202: am 7fc3a06d: Merge "build: add logd"
* commit '4c65c202355572f22b3cb48babf0436098807dc7':
  build: add logd
2014-02-27 16:26:54 +00:00
Nick Kralevich
1884833c3a build: add logd
Original-Change-Id: I1b96d7e6dd823a83b07b312bf07792482e883789
Signed-off-by: Nick Kralevich <nnk@google.com>

* merge conflicts
* rename syslog to logd to avert confusion with bionic syslog

Signed-off-by: Mark Salyzyn <salyzyn@google.com>

Change-Id: I137fb639a80dd28d2f0042b3ae9b7d6eb5eb5bc4
2014-02-26 15:39:38 -08:00
Nicolas Prevot
c1b2536f63 Making ManagedProvisioning present in all phones/tablets.
Change-Id: Icf004835f526e5e6a2798fc5a0003c25d837289d
2014-02-25 10:04:12 +00:00
Mark Salyzyn
5bcb2c86d7 Merge "build: add logd" 2014-02-20 22:50:03 +00:00
Steve Moyer
6bbb6a1fe3 Combine emulator test projects into a single apk
SmsTest, GpsLocationTest, ConnectivityTest -> EmulatorSmokeTests

Change-Id: I39e02fbe2cf9761607dfb4c2f0d6c4906e8b1e51
2014-02-19 10:39:20 -08:00
Stephen Hines
a0d13d81d6 am 515f379f: am f1ad4d2d: Merge "Add bcc to the list of PRODUCT_PACKAGES to install."
* commit '515f379f1dd14e7564ad99dec42549a263863166':
  Add bcc to the list of PRODUCT_PACKAGES to install.
2014-02-18 23:18:06 +00:00
Stephen Hines
515f379f1d am f1ad4d2d: Merge "Add bcc to the list of PRODUCT_PACKAGES to install."
* commit 'f1ad4d2d2eea9952963fd52fa56e9ab16b108618':
  Add bcc to the list of PRODUCT_PACKAGES to install.
2014-02-18 23:12:37 +00:00
Stephen Hines
816b86f759 Add bcc to the list of PRODUCT_PACKAGES to install.
Bug: 7342767

As part of the process of sandboxing the online RenderScript compiler, we
need to install bcc.

Change-Id: Ia650bdcb760246f3f1e15ebb867f07d9802cdfbe
2014-02-18 14:21:39 -08:00
Colin Cross
b01233f26f am a0eb50ac: resolved conflicts for merge of 2fbe5018 to klp-modular-dev-plus-aosp
* commit 'a0eb50accabe83b18bd3fe3b9d6417a4718af9e2':
  add linker64 and debuggerd64 to all products
2014-02-14 00:51:53 +00:00
Colin Cross
a0eb50acca resolved conflicts for merge of 2fbe5018 to klp-modular-dev-plus-aosp
Change-Id: I623332e427ce8bfcf1b17e708ccca1d50cdbeadd
2014-02-13 16:32:48 -08:00
Colin Cross
381435353d add linker64 and debuggerd64 to all products
Add linker64 and debuggerd64 to embedded.mk.  They will be silently
ignored on 32-bit builds, and filtered out on 32-bit sdk builds.

Change-Id: I8c30ea65e2b7e224ee73cc9fbbcb7555d3be04b5
2014-02-13 16:23:33 -08:00
Colin Cross
59dc65a28a am 481fed17: am f10efbc1: Merge "make 64-bit builds into multiarch builds"
* commit '481fed17fad5141154d8cf9532c0803ade24a6a6':
  make 64-bit builds into multiarch builds
2014-02-13 21:38:00 +00:00
Colin Cross
481fed17fa am f10efbc1: Merge "make 64-bit builds into multiarch builds"
* commit 'f10efbc15e458f50bb29fe9ad0653fb2e08fd8fb':
  make 64-bit builds into multiarch builds
2014-02-13 21:20:31 +00:00
Colin Cross
930b5fbcb9 make 64-bit builds into multiarch builds
Also enable the 64-bit binder interface and make them only use ART.

Change-Id: I05de41ce348c14722c84a658f745659bde5ba423
2014-02-12 19:49:47 -08:00
Ying Wang
e6a65a5f15 resolved conflicts for merge of b6d53f0b to master
Change-Id: Id01809e2a72ca8ba13594621690273fc6f982095
2014-02-12 14:58:06 -08:00
Ying Wang
b6d53f0b31 am bec954d0: Merge "Clean up dangling module names"
* commit 'bec954d05e0eeec178c796d2332ee9a86becb5dc':
  Clean up dangling module names
2014-02-12 19:22:52 +00:00
Ying Wang
d18e570fba Clean up dangling module names
Those modules have disappeared from the source tree.

https://code.google.com/p/android/issues/detail?id=61210

Change-Id: Iab369d2f591f46eb86b9fccf2087515edf974662
2014-02-11 17:28:30 -08:00
Ying Wang
1eba3c14c7 am 484c7dec: am ba46260f: Merge "Runtime resource overlay, iteration 2"
* commit '484c7dec798c8ba068f282d1d4398bfdd9b634d3':
  Runtime resource overlay, iteration 2
2014-02-11 19:41:03 +00:00
Ying Wang
484c7dec79 am ba46260f: Merge "Runtime resource overlay, iteration 2"
* commit 'ba46260f8dee97138d2eb456560b45eb9f914930':
  Runtime resource overlay, iteration 2
2014-02-11 19:34:55 +00:00
Ying Wang
ba46260f8d Merge "Runtime resource overlay, iteration 2" 2014-02-11 19:27:59 +00:00
Justin Koh
f26c96edc5 resolved conflicts for merge of 34cb6460 to master
Change-Id: I46982ef15b479e55b5cdf2f446577fbaa1356cea
2014-02-11 11:26:14 -08:00
Justin Koh
34cb646077 am f0c58da0: Change core_tiny to not be minimal font footprint.
* commit 'f0c58da07d6ebcff215338c1cd1f4410786c1858':
  Change core_tiny to not be minimal font footprint.
2014-02-11 18:59:47 +00:00
Justin Koh
f0c58da07d Change core_tiny to not be minimal font footprint.
Change core_tiny to not be minimal font footprint: UX really wants roboto
condensed. Checked /proc/meminfo before and after the change and didn't
see much difference.

Change-Id: I94072f674ff678dfdbddd66d3792e63245e5e7da
2014-02-11 10:28:11 -08:00
Steve Moyer
60250d42a1 Merge "Adding SmsTest to sdk build" 2014-02-11 00:42:16 +00:00
David 'Digit' Turner
35cfe9e8af am cc57457c: am 145562fc: Merge "Add missing font files to SDK system images."
* commit 'cc57457c880fdf5e85dd07b11fa61928ca692b45':
  Add missing font files to SDK system images.
2014-02-10 13:29:51 +00:00
David 'Digit' Turner
cc57457c88 am 145562fc: Merge "Add missing font files to SDK system images."
* commit '145562fcef979e4fea946987717618dba6148aeb':
  Add missing font files to SDK system images.
2014-02-10 12:10:22 +00:00
David 'Digit' Turner
145562fcef Merge "Add missing font files to SDK system images." 2014-02-10 11:31:18 +00:00
Steve Moyer
577e914b03 Adding SmsTest to sdk build
Change-Id: I42cf752e188ce579ecb9e9c6439d369bdbb0c177
2014-02-07 11:46:08 -08:00
Elliott Hughes
77f88ce0da am 3f040869: am efb9603a: Merge "[MIPS64] Add mips64 target"
* commit '3f0408695b23a8d21c3227ae845006381b26f666':
  [MIPS64] Add mips64 target
2014-02-06 20:29:48 +00:00
Elliott Hughes
3f0408695b am efb9603a: Merge "[MIPS64] Add mips64 target"
* commit 'efb9603aeb5ac71e23fa2a3ade6aa4fc2efdeb5e':
  [MIPS64] Add mips64 target
2014-02-06 20:21:41 +00:00