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
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
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
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
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
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
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