Commit graph

1305 commits

Author SHA1 Message Date
Ying Wang
54a570bd1d am 57df0c7b: Merge "Increase system image size of generic_x86_64 to 650MB."
* commit '57df0c7bf5a78b1c4edb7e06d22ccc91ad46b41d':
  Increase system image size of generic_x86_64 to 650MB.
2014-05-05 18:41:32 +00:00
Ying Wang
edf99a23ee Increase system image size of generic_x86_64 to 650MB.
Change-Id: Iacf6dcd00d78039d1b19595db6f293f8f202ac5a
2014-05-05 11:34:30 -07:00
Justin Koh
f0e151152a am 007f8c80: am 0e35df2a: Add ContactsProvider to core_tiny.
* commit '007f8c804fbabfea461db546eb46ac9b1d3e9e3d':
  Add ContactsProvider to core_tiny.
2014-05-05 17:50:37 +00:00
Justin Koh
007f8c804f am 0e35df2a: Add ContactsProvider to core_tiny.
* commit '0e35df2a7c77a6308106fa9a48f90c4729b9b8f3':
  Add ContactsProvider to core_tiny.
2014-05-05 17:46:55 +00:00
Justin Koh
0e35df2a7c Add ContactsProvider to core_tiny.
Add ContactsProvider to core_tiny: this is necessary to pass CTS.

Change-Id: I159109740f329e5c540ffb6f1cd1b1a7f9429d86
2014-05-04 16:31:02 -07:00
Colin Cross
75b29ae078 build: add core_64_bit.mk
Add a new product, core_64_bit.mk, that products can inherit from
to configure zygote and the rest of the build system for a standard
64-bit product.

Make the 64-bit emulator targets for arm64, mips64, and x86_64
inherit from it.

Change-Id: I7e809264db39472f554cd5290529f3d6499345d4
2014-05-01 10:56:12 -07:00
Colin Cross
e5381d074f Merge "verity: clean up verity build dependencies" 2014-04-30 20:47:58 +00:00
Ying Wang
09a4e6870d Add SDK product for arm64, x86_64 and mips64.
Bug: 14411602
Change-Id: Ia609321864ddade27df97448c8037f25c4ef99aa
2014-04-29 12:48:06 -07:00
Bill Yi
1e4adfa837 Merge commit '8113e43601aac7702b9ec007e81a179826143d1e' into HEAD 2014-04-29 11:32:53 -07:00
Colin Cross
8a30f72c0c verity: clean up verity build dependencies
Move image dependencies out of PRODUCT_PACKAGES and into direct
dependencies for the image building rules.

Fix the test for PRODUCT_SUPPORTS_VERITY, it needs to check for
the current project as the global is no longer set.

Change-Id: I811501834ae5ec658229bd505fcc48275ff578c9
2014-04-28 17:19:04 -07:00
Ying Wang
8d4562a14d resolved conflicts for merge of 0a694f4c to master
Change-Id: Idec6e6837c6329dae423a12fc084a11bca82463d
2014-04-25 09:28:00 -07:00
Ying Wang
0a694f4c57 am c564b691: Remove libs from target/product/base.mk.
* commit 'c564b691d55d4dcede7ce46248b1a87acf3d2618':
  Remove libs from target/product/base.mk.
2014-04-25 16:13:55 +00:00
Ying Wang
c564b691d5 Remove libs from target/product/base.mk.
LatinIME has libjni_latinime as dependency, so we don't need it in
PRODUCT_PACKAGES;
Moved libpac close to PacProcesser, which requires libpac.

Change-Id: I8674d76bcfde4c0e1f1b04bc96e636022d008576
2014-04-24 17:12:58 -07:00
Lajos Molnar
9fcc2da4db Merge "Remove VideoEditor" 2014-04-22 18:33:39 +00:00
Ian Rogers
2b96d6ae78 resolved conflicts for merge of 77efd7b4 to master
Change-Id: I2ff1be499d3c4a5c7da3b016c63a519edcda458f
2014-04-22 10:03:16 -07:00
Ian Rogers
77efd7b4cd am f1d5dcdd: am 850299f6: Merge "Make the zygote 64-bit for the x86-64 emulator."
* commit 'f1d5dcdd30e1f181cc1fce6d99f0f3aa589c8edd':
  Make the zygote 64-bit for the x86-64 emulator.
2014-04-22 15:45:44 +00:00
Ian Rogers
f1d5dcdd30 am 850299f6: Merge "Make the zygote 64-bit for the x86-64 emulator."
* commit '850299f6a6a831d47af68a3004a62df21b5fee3a':
  Make the zygote 64-bit for the x86-64 emulator.
2014-04-22 15:43:04 +00:00
Lajos Molnar
e685ff0f0c Remove VideoEditor
This app is no longer supported as there are 3rd party video editing
apps, such as Google+ Video Editor.

Bug: 13542518
Change-Id: Ib3a4e2e7d3e261e12355650fc4db62ac59daef8e
2014-04-22 00:18:42 +00:00
Marco Nelissen
863c9e9cf5 Add libmediandk
Change-Id: I2c9645d16b56aafb05b52369b0774adffb575197
2014-04-21 10:26:17 -07:00
Ian Rogers
d4186e8c1f Make the zygote 64-bit for the x86-64 emulator.
Change-Id: I4ad5d1ef2406e947176c8e180822b25c04fc83f0
2014-04-18 17:09:33 -07:00
Ying Wang
105ed03cf0 am 25e75aba: am 6e3bbf64: am 0ac89b45: Merge "Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build."
* commit '25e75abac2c9229c0c4741e33f504a341a36ad94':
  Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build.
2014-04-15 23:42:38 +00:00
Ying Wang
25e75abac2 am 6e3bbf64: am 0ac89b45: Merge "Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build."
* commit '6e3bbf64b2c8ac49b5b1e1ff368a120118c04e65':
  Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build.
2014-04-15 23:36:05 +00:00
Ying Wang
6e3bbf64b2 am 0ac89b45: Merge "Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build."
* commit '0ac89b459542ef88a8c61f45f0d6b680f9931ddf':
  Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build.
2014-04-15 23:34:34 +00:00
Ying Wang
e948255ac6 Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build.
Bug: 11368415
Bug: 14087863
Change-Id: I05d406d174ea1d1bf67c7922c03950e700978baa
2014-04-15 14:42:27 -07:00
Steve Moyer
b9d6f6f15c Merge "DO NOT MERGE: Combine emulator test projects into a single apk" 2014-04-04 16:32:06 +00:00
Geremy Condra
8cc491cff3 Merge "Add verity dev keys to build." 2014-04-04 00:49:51 +00:00
Steve Moyer
0ced06ea0f DO NOT MERGE: Combine emulator test projects into a single apk
SmsTest, GpsLocationTest, ConnectivityTest -> EmulatorSmokeTests

Conflicts:
	target/product/sdk.mk

Change-Id: Ia5add1bc6360c27f84aab8f32b30c312435b1871
2014-04-03 16:01:06 -07:00
Ji-Hwan Lee
dccce7bbe9 Add handheld_core_hardware.xml to telephony base
Bug: 13683526
Change-Id: I8085fa1abfa460213c3c9fe2a63217ee16b9ff8a
2014-04-03 14:23:40 +09:00
Greg Hackmann
b3f2dac1e0 am 0fd37501: am f518e838: am f1750876: Merge "Revert "HACK: disable emulator on x86_64""
* commit '0fd37501c4610783c53a6f8d4000ba7a230f61df':
  Revert "HACK: disable emulator on x86_64"
2014-04-03 01:41:16 +00:00
Geremy Condra
7afae2c115 Add verity dev keys to build.
These will be used when making images from your dev machine.

Change-Id: Ib1c894f6874a8e1a7d3d6e8133c8e897d40080d4
2014-04-02 18:17:39 -07:00
Greg Hackmann
0fd37501c4 am f518e838: am f1750876: Merge "Revert "HACK: disable emulator on x86_64""
* commit 'f518e8380cc5d4e1a25ca5fad161a7cd7e7e78dd':
  Revert "HACK: disable emulator on x86_64"
2014-04-02 23:04:57 +00:00
Greg Hackmann
f175087608 Merge "Revert "HACK: disable emulator on x86_64"" 2014-04-02 22:53:45 +00:00
Colin Cross
9871d2e270 am 0396b102: am 578f7ec4: am 45db0e05: Merge "aosp_arm64: increase userdata image size"
* commit '0396b10235ece43be797e48673ec05c4cf4c74d7':
  aosp_arm64: increase userdata image size
2014-04-02 17:44:54 +00:00
Colin Cross
0396b10235 am 578f7ec4: am 45db0e05: Merge "aosp_arm64: increase userdata image size"
* commit '578f7ec487c2c00581cdc9807d0d24883ba4406a':
  aosp_arm64: increase userdata image size
2014-04-02 17:39:56 +00:00
Colin Cross
45db0e058a Merge "aosp_arm64: increase userdata image size" 2014-04-02 17:28:22 +00:00
Colin Cross
d46c7381c8 aosp_arm64: increase userdata image size
Increase userdata image size to allow make tests to builds with
extra tests to fit.

Change-Id: I2fea99d5a39816e78595215481b60ee51eb9182f
2014-04-02 09:17:29 -07:00
Narayan Kamath
c54d7f2148 am b6cc8421: am 2c9552b7: am aafbbe7e: Merge "Add a default value for ro.zygote."
* commit 'b6cc84212875fda1b8d2ccc0a66fc6a2169933d9':
  Add a default value for ro.zygote.
2014-04-01 18:33:37 +00:00
Narayan Kamath
b6cc842128 am 2c9552b7: am aafbbe7e: Merge "Add a default value for ro.zygote."
* commit '2c9552b78486ae1592303932dc70e00ff487d76f':
  Add a default value for ro.zygote.
2014-04-01 16:33:26 +00:00
Greg Hackmann
dc01136bea Revert "HACK: disable emulator on x86_64"
This reverts commit 4562c5bcb3.
2014-03-31 16:54:52 -07:00
Narayan Kamath
39fd21a2df Add a default value for ro.zygote.
Also makes sure the correct init config file is
copied across.

Change-Id: I281d00dab17f780bda21bf3fbc35418df18dffb1
2014-03-31 12:33:45 +01:00
Geremy Condra
9a6e87648b Merge "Add the verity key to the verity dependencies." 2014-03-26 01:03:53 +00:00
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
81717cc251 am 84fbc7e8: am 996f3826: am c5a56344: am 1c43aaea: Merge "Remove the redundant DISABLE_DEXPREOPT"
* commit '84fbc7e82a0a075c3cc8bb73baa9e6d87fd53aa4':
  Remove the redundant DISABLE_DEXPREOPT
2014-03-20 22:27:16 +00: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
996f3826f7 am c5a56344: am 1c43aaea: Merge "Remove the redundant DISABLE_DEXPREOPT"
* commit 'c5a563447a68c30dd998b7cd6f8f8c30693edc37':
  Remove the redundant DISABLE_DEXPREOPT
2014-03-20 20:18:38 +00:00
Ying Wang
3c598d19b2 am c5a56344: am 1c43aaea: Merge "Remove the redundant DISABLE_DEXPREOPT"
* commit 'c5a563447a68c30dd998b7cd6f8f8c30693edc37':
  Remove the redundant DISABLE_DEXPREOPT
2014-03-20 20:18:32 +00:00
Ying Wang
c6848b398d Remove the redundant DISABLE_DEXPREOPT
To disable dexpreopt, use just:
WITH_DEXPREOPT=false

Change-Id: I5804f3774f8ec50eb16c5336776dbce0c28b16d9
2014-03-20 13:01:31 -07:00
Ying Wang
7796921cc5 am 9ce34617: am 4f9d6f57: Merge "Fix embedded build"
* commit '9ce34617a001338093b0de85443925a37a967f0d':
  Fix embedded build
2014-03-20 19:38:45 +00: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
Nick Kralevich
db17a9d00c am 77e63659: am cea2ad87: am e623b4c2: am f2fd6d9a: Merge "Allow shell serial_device read-write access"
* commit '77e63659d3d7be6ea891b07ae5f84cee70a392fa':
  Allow shell serial_device read-write access
2014-03-19 17:02:27 +00:00
Nick Kralevich
3c6ba59764 am e623b4c2: am f2fd6d9a: Merge "Allow shell serial_device read-write access"
* commit 'e623b4c2c2b585ad19627e13347474b70377c78b':
  Allow shell serial_device read-write access
2014-03-19 16:53:01 +00:00
Nick Kralevich
cea2ad87ff am e623b4c2: am f2fd6d9a: Merge "Allow shell serial_device read-write access"
* commit 'e623b4c2c2b585ad19627e13347474b70377c78b':
  Allow shell serial_device read-write access
2014-03-19 16:49:21 +00:00
Nick Kralevich
f2fd6d9af2 Merge "Allow shell serial_device read-write access" 2014-03-19 16:37:40 +00:00
Geremy Condra
a8a7572169 Add the verity key to the verity dependencies.
Missed this last time around. Needed to boot.

Change-Id: I67f25ed442365ad0171ecbc37bc2de02b7108399
2014-03-18 21:25:26 -07:00
Geremy Condra
acd99d9367 Merge "Add verity build targets for verity-enabled devices." 2014-03-18 22:23:48 +00:00
Nick Kralevich
b20966f803 Allow shell serial_device read-write access
When starting the emulator, the system console writes entries
to /dev/ttyS2. We need to allow the writes, otherwise this generates
denials when you run "emulator -verbose -logcat '*:v' -show-kernel"

Addresses the following denial:
type=1400 audit(1395076594.320:446): avc:  denied  { read write } for  pid=5600 comm="sh" path="/dev/ttyS2" dev="tmpfs" ino=1487 scontext=u:r:shell:s0 tcontext=u:object_r:serial_device:s0 tclass=chr_file

Bug: 13506702
Change-Id: I3729537cabb0bf8e8b2905d3def43a293bb1081f
2014-03-18 15:17:35 -07:00
Greg Hackmann
c217d7b7c1 am 6099a84f: am 2521d0d2: am 5a4183f3: am 267afcde: Merge "HACK: disable emulator on x86_64"
* commit '6099a84f14804d741f0574c0c211b507d2ae21ae':
  HACK: disable emulator on x86_64
2014-03-18 20:53:00 +00:00
Greg Hackmann
b5169b4d75 am 5a4183f3: am 267afcde: Merge "HACK: disable emulator on x86_64"
* commit '5a4183f3916f2666edfa4a6f1d0f4f7da07cd52e':
  HACK: disable emulator on x86_64
2014-03-18 19:29:01 +00:00
Greg Hackmann
2521d0d23a am 5a4183f3: am 267afcde: Merge "HACK: disable emulator on x86_64"
* commit '5a4183f3916f2666edfa4a6f1d0f4f7da07cd52e':
  HACK: disable emulator on x86_64
2014-03-18 19:28:33 +00:00
Greg Hackmann
4562c5bcb3 HACK: disable emulator on x86_64
The build system and qemu disagree about where the x86_64 kernel should
live; disable the emulator until that's resolved

Change-Id: Ia7a2745ee8f3f4211ce39f8d851d5d860acbf62b
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2014-03-18 11:13:37 -07: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
Colin Cross
0af8bc1ed1 am c48da22b: am 8213b719: am 6e92ade0: am db24577b: Merge "Work in progress to enable build system support for Clang."
* commit 'c48da22b6d0f7be0b9ce9f1d448fc524e692e86c':
  Work in progress to enable build system support for Clang.
2014-03-16 00:06:17 +00:00
Colin Cross
f6da0820b3 am 6e92ade0: am db24577b: Merge "Work in progress to enable build system support for Clang."
* commit '6e92ade0a6cd8aea8f074fdc44f375ef2f1d50b7':
  Work in progress to enable build system support for Clang.
2014-03-16 00:00:20 +00:00
Colin Cross
8213b719c8 am 6e92ade0: am db24577b: Merge "Work in progress to enable build system support for Clang."
* commit '6e92ade0a6cd8aea8f074fdc44f375ef2f1d50b7':
  Work in progress to enable build system support for Clang.
2014-03-15 23:59:32 +00:00
Tim Murray
b5f333bbef Work in progress to enable build system support for Clang.
Change-Id: I278b48bcd976afcbde8d86261da9b9b9efc9002c
2014-03-14 00:39:03 -07: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
Victoria Lease
e19b86cbbd am 4e965ac6: am 38626e63: Merge "Add external/google-fonts/*/fonts.mk."
* commit '4e965ac6f56de2071a381ed37e4a9899062e5ab2':
  Add external/google-fonts/*/fonts.mk.
2014-03-11 18:28:39 +00:00
Ying Wang
e2b42b34e1 am a90e346c: am cd07521f: Merge "Revert "generic_x86: toggle 64bit binder ABI""
* commit 'a90e346c24d498af57360bd92ff738a1480f0598':
  Revert "generic_x86: toggle 64bit binder ABI"
2014-03-11 18:16:25 +00:00
Mark Salyzyn
5e9a4fa67b am 4c65c202: am 7fc3a06d: Merge "build: add logd"
* commit '4c65c202355572f22b3cb48babf0436098807dc7':
  build: add logd
2014-03-11 18:16:24 +00:00
Nick Kralevich
a705e44d0b am 9edc9783: Merge "Add policy for MIPS emulator, fix x86 policy."
* commit '9edc9783d21f59bc532e2b7b62ae2464ee976438':
  Add policy for MIPS emulator, fix x86 policy.
2014-03-11 18:08:37 +00:00
Nick Kralevich
05cc2e26c4 am e7154870: Merge "Move qemud and /dev/qemu policy bits to emulator-specific sepolicy."
* commit 'e715487031036ecc75bfedb94b2d6c9dbd3bc98d':
  Move qemud and /dev/qemu policy bits to emulator-specific sepolicy.
2014-03-11 17:12:16 +00:00
Ying Wang
aa6c50aaae am 0e0c4879: Merge "generic_x86: toggle 64bit binder ABI"
* commit '0e0c48796d9d0ebe415b1ccc9f67ae95f9c716c9':
  generic_x86: toggle 64bit binder ABI
2014-03-11 00:38:38 +00:00
Colin Cross
d24f6feff3 am b3bc6136: Merge "arm64: don\'t build emulator"
* commit 'b3bc61365bb71cc45d10c22762aa86a3b78f1329':
  arm64: don't build emulator
2014-03-07 23:19:17 +00:00
Stephen Hines
033aa738a8 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-03-07 19:40:01 +00:00
Colin Cross
21bef6460d am 2fbe5018: Merge "add linker64 and debuggerd64 to all products"
* commit '2fbe5018f94f536541c0137be472e58c79890813':
  add linker64 and debuggerd64 to all products
2014-03-07 19:33:27 +00:00
Colin Cross
8743fc32df am f10efbc1: Merge "make 64-bit builds into multiarch builds"
* commit 'f10efbc15e458f50bb29fe9ad0653fb2e08fd8fb':
  make 64-bit builds into multiarch builds
2014-03-07 19:33:07 +00:00
Ying Wang
14040db928 am bec954d0: Merge "Clean up dangling module names"
* commit 'bec954d05e0eeec178c796d2332ee9a86becb5dc':
  Clean up dangling module names
2014-03-07 02:27:32 +00:00
Ying Wang
16ce683377 am ba46260f: Merge "Runtime resource overlay, iteration 2"
* commit 'ba46260f8dee97138d2eb456560b45eb9f914930':
  Runtime resource overlay, iteration 2
2014-03-07 02:27:02 +00:00
David 'Digit' Turner
41925c4b06 am 145562fc: Merge "Add missing font files to SDK system images."
* commit '145562fcef979e4fea946987717618dba6148aeb':
  Add missing font files to SDK system images.
2014-03-07 02:25:51 +00:00
Elliott Hughes
17a1e7a412 am efb9603a: Merge "[MIPS64] Add mips64 target"
* commit 'efb9603aeb5ac71e23fa2a3ade6aa4fc2efdeb5e':
  [MIPS64] Add mips64 target
2014-03-07 02:24:02 +00:00
Eric Laurent
20d5476f7f move audio policy service to a separate library
Change-Id: I2612253148238e0cce12bd5a0effcb790e86e5f0
2014-03-06 14:42:00 -08:00
Brian Carlstrom
b21f65fa9f am cece05e2: Merge "Bump generic_mips BOARD_SYSTEMIMAGE_PARTITION_SIZE for PRODUCT_RUNTIME := libart_runtime_default"
* commit 'cece05e273dc1c9d4ea140b294df72005ac8ac53':
  Bump generic_mips BOARD_SYSTEMIMAGE_PARTITION_SIZE for PRODUCT_RUNTIME := libart_runtime_default
2014-03-06 20:23:25 +00: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
Ying Wang
2fa191d777 am 3fd8a4fe: am 529a772e: am a90e346c: am cd07521f: Merge "Revert "generic_x86: toggle 64bit binder ABI""
* commit '3fd8a4feae8c384ea04ce50452092a0079553f0e':
  Revert "generic_x86: toggle 64bit binder ABI"
2014-02-27 17:30:05 +00:00
Ying Wang
529a772eec am a90e346c: am cd07521f: Merge "Revert "generic_x86: toggle 64bit binder ABI""
* commit 'a90e346c24d498af57360bd92ff738a1480f0598':
  Revert "generic_x86: toggle 64bit binder ABI"
2014-02-27 17:24:45 +00:00
Ying Wang
cd07521f46 Merge "Revert "generic_x86: toggle 64bit binder ABI"" 2014-02-27 17:19:34 +00:00
Ying Wang
32d35a71ff Revert "generic_x86: toggle 64bit binder ABI"
This reverts commit e2525ade32.

Change-Id: Ibaec151084ce4f00194a5a22c4be7531710b4a9f
2014-02-27 17:19:13 +00: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