tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
17750 commits 1 branch 0 tags 119 MiB
Commit graph

1347 commits

Author SHA1 Message Date
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
Ben Murdoch
675919dfc7 All devices that depend on WebView must have the system feature. 
We add a new system feature that declares if a functioning WebView is
present on the device, so copy that permission into builds that
depend on the WebView.

Bug: 13438487

Change-Id: I05bcfec2417862d41aacbacb8b2cc0e59f7c4549
 2014-04-04 21:20:55 +01: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
Mark Salyzyn
7fc3a06d7f Merge "build: add logd" 2014-02-27 16:03:58 +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
Nick Kralevich
8e6f18d7d2 am e9513f95: am 65f26a76: am 9edc9783: Merge "Add policy for MIPS emulator, fix x86 policy." 
* commit 'e9513f95c930977086a2b3ec370646e500866652':
  Add policy for MIPS emulator, fix x86 policy.
 2014-02-26 22:39:05 +00:00
Nick Kralevich
65f26a769a am 9edc9783: Merge "Add policy for MIPS emulator, fix x86 policy." 
* commit '9edc9783d21f59bc532e2b7b62ae2464ee976438':
  Add policy for MIPS emulator, fix x86 policy.
 2014-02-26 22:31:01 +00:00
Stephen Smalley
1c0e1cde7b Add policy for MIPS emulator, fix x86 policy. 
The qemud and /dev/qemu_pipe policy bits copied to generic
and generic_x86 by I620d4aef84a5d4565abb1695db54ce1653612bce
are required for generic_mips as well.  In testing, we
further saw other denials for generic_mips that correspond
exactly to what is already allowed in the generic sepolicy, so
just inherit the sepolicy files from generic for now.
We could do likewise for the generic_x86 sepolicy for the files that are
identical with generic if desired, but that is not done by this change.

The generic_x86 sepolicy was missing a rule for /sys/qemu_trace
moved to the generic sepolicy by the prior change, so fix that omission.

The generic*64 variants will need something similar, either by inheriting
from one of the existing sepolicy directories as in the MIPS
case or by forking their own copies as in the x86 case.

Change-Id: Iec7c8825734a3f96f7db8ae1d10dce1f30b22bdf
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
 2014-02-26 09:12:55 -05:00
Nick Kralevich
b4f4dc9685 am 61b71bb2: am b8d792d7: am e7154870: Merge "Move qemud and /dev/qemu policy bits to emulator-specific sepolicy." 
* commit '61b71bb211dc6c1d9cb85a25232d8b0234bfe13c':
  Move qemud and /dev/qemu policy bits to emulator-specific sepolicy.
 2014-02-25 22:07:14 +00:00
Nick Kralevich
b8d792d734 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-02-25 21:58:45 +00:00
Stephen Smalley
768ff518f0 Move qemud and /dev/qemu policy bits to emulator-specific sepolicy. 
Change-Id: I620d4aef84a5d4565abb1695db54ce1653612bce
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
 2014-02-25 13:49:57 -05:00
Nicolas Prevot
c1b2536f63 Making ManagedProvisioning present in all phones/tablets. 
Change-Id: Icf004835f526e5e6a2798fc5a0003c25d837289d
 2014-02-25 10:04:12 +00:00
Ying Wang
0fad566932 am 4a2e083f: am 0e0c4879: Merge "generic_x86: toggle 64bit binder ABI" 
* commit '4a2e083fa532d94610f07f8a0ae8f32216231266':
  generic_x86: toggle 64bit binder ABI
 2014-02-24 18:16:50 +00:00
Ying Wang
4a2e083fa5 am 0e0c4879: Merge "generic_x86: toggle 64bit binder ABI" 
* commit '0e0c48796d9d0ebe415b1ccc9f67ae95f9c716c9':
  generic_x86: toggle 64bit binder ABI
 2014-02-24 18:10:29 +00:00
Ying Wang
0e0c48796d Merge "generic_x86: toggle 64bit binder ABI" 2014-02-24 18:05:34 +00:00
Colin Cross
9d82efbce7 am 6da37a0f: am b3bc6136: Merge "arm64: don\'t build emulator" 
* commit '6da37a0fd37ebc8d79b9119a13f80207d5560aaf':
  arm64: don't build emulator
 2014-02-21 13:54:00 +00:00
Colin Cross
6da37a0fd3 am b3bc6136: Merge "arm64: don\'t build emulator" 
* commit 'b3bc61365bb71cc45d10c22762aa86a3b78f1329':
  arm64: don't build emulator
 2014-02-20 22:55:24 +00:00
Mark Salyzyn
5bcb2c86d7 Merge "build: add logd" 2014-02-20 22:50:03 +00:00
Colin Cross
15b1c8377d arm64: don't build emulator 
There is no emulator kernel yet, so don't try to build the emulator.

Change-Id: I714f5717f439b4e48a973f4355f2c6684af79764
 2014-02-20 14:39:09 -08:00
Baligh Uddin
efa671d2fd Add the Telecomm entry in core.mk 2014-02-20 14:15:01 -08: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
Octavian Purdila
e2525ade32 generic_x86: toggle 64bit binder ABI 
Change-Id: I60b8d98ff1f1ba5f242d256279e27d780b5dabf9
Signed-off-by: Octavian Purdila <octavian.purdila@intel.com>
 2014-02-11 13:32:15 +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
Andreas Huber
a42d3a4865 fix the build, libstagefright_chromium_http is no longer needed. 
Change-Id: I1777b3e9157a4bdb868b9e14cc62422b1e017c5d
 2014-02-06 09:29:48 -08:00
Chris Dearman
1efd9e462a [MIPS64] Add mips64 target 
Change-Id: Ice1621101c0d5a3314db288542ca8020e3f406bf
Signed-off-by: Duane Sand <duane.sand@imgtec.com>
 2014-02-05 19:07:57 -08:00
David 'Digit' Turner
b0dac93412 Add missing font files to SDK system images. 
This adds a few missing font families to SDK system images.
This allows, in particular, support for the Korean language.

Note that this depends on other patches under device/generic/
to fix some board and product configuration files, otherwise
this change will have no effect.

See http://b.android.com/40340

Change-Id: Idba6471de32232833f511a4da97fd652906fec51
 2014-02-04 14:49:23 +01:00
Noreen Tolland
4b69be271c am c816e061: Merge "(DO NOT MERGE) Revert "Make libart the default runtime"" into klp-modular-dev 
* commit 'c816e061270327d3e2b73ae3c848e1fefc6ec6ef':
  (DO NOT MERGE) Revert "Make libart the default runtime"
 2014-01-31 23:17:33 +00:00
Noreen Tolland
c816e06127 Merge "(DO NOT MERGE) Revert "Make libart the default runtime"" into klp-modular-dev 2014-01-31 23:13:24 +00:00
Nick Vaccaro
2422e76192 am ec0c99a6: Add atrace for supporting systrace tool 
* commit 'ec0c99a6c574954fb37bd94ba18b02a20edbe122':
  Add atrace for supporting systrace tool
 2014-01-31 16:41:07 +00:00
Mårten Kongstad
2e1ade925c Runtime resource overlay, iteration 2 
Support any number of overlay packages. Support any target package.

UPDATED PACKAGE MATCHING
------------------------
In Runtime resource overlay, iteration 1, only a single overlay package
was considered. Package matching was based on file paths:
/vendor/overlay/system/framework-res.apk corresponded to
/system/framework-res.apk. Introduce a more flexible matching scheme
where any package is an overlay package if its manifest includes

    <overlay targetPackage="com.target.package"/>

For security reasons, an overlay package must fulfill certain criteria
to take effect: see below.

THE IDMAP TOOL AND IDMAP FILES
------------------------------
Idmap files are created by the 'idmap' binary; idmap files must be
present when loading packages. For the Android system, Zygote calls
'idmap' as part of the resource pre-loading. For application packages,
'idmap' is invoked via 'installd' during package installation (similar
to 'dexopt').

UPDATED FLOW
------------
The following is an outline of the start-up sequences for the Android
system and Android apps. Steps marked with '+' are introduced by this
commit.

Zygote initialization
   Initial AssetManager object created
+    idmap --scan creates idmaps for overlays targeting 'android', \
           stores list of overlays in /data/resource-cache/overlays.list
   AssetManager caches framework-res.apk
+  AssetManager caches overlay packages listed in overlays.list

Android boot
   New AssetManager's ResTable acquired
     AssetManager re-uses cached framework-res.apk
+    AssetManager re-uses cached 'android' overlays (if any)

App boot
   ActivityThread prepares AssetManager to load app.apk
+  ActivityThread prepares AssetManager to load app overlays (if any)
   New AssetManager's ResTable acquired as per Android boot

SECURITY
--------
Overlay packages are required to be pre-loaded (in /vendor/overlay).
These packages are trusted by definition. A future iteration of runtime
resource overlay may add support for downloaded overlays, which would
likely require target and overlay signatures match for the overlay to
be trusted.

LOOKUP PRIORITY
---------------
During resource lookup, packages are sequentially queried to provide a
best match, given the constraints of the current configuration. If any
package provide a better match than what has been found so far, it
replaces the previous match. The target package is always queried last.

When loading a package with more than one overlay, the order in which
the overlays are added become significant if several packages overlay
the same resource.

Had downloaded overlays been supported, the install time could have been
used to determine the load order. Regardless, for pre-installed
overlays, the install time is randomly determined by the order in which
the Package Manager locates the packages during initial boot. To support
a well-defined order, pre-installed overlay packages are expected to
define an additional 'priority' attribute in their <overlay> tags:

    <overlay targetPackage="com.target.package" priority="1234"/>

Pre-installed overlays are loaded in order of their priority attributes,
sorted in ascending order.

Assigning the same priority to several overlays targeting the same base
package leads to undefined behaviour. It is the responsibility of the
vendor to avoid this.

The following example shows the ResTable and PackageGroups after loading
an application and two overlays. The resource lookup framework will
query the packages in the order C, B, A.

        +------+------+-     -+------+------+
        | 0x01 |      |  ...  |      | 0x7f |
        +------+------+-     -+------+------+
            |                           |
        "android"                Target package A
                                        |
                       Pre-installed overlay B (priority 1)
                                        |
                       Pre-installed overlay C (priority 2)

Change-Id: If49c963149369b1957f7d2303b3dd27f669ed24e
 2014-01-31 14:44:07 +01:00
Brian Carlstrom
d4e29f528a 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-01-31 10:26:48 +00:00
Nick Vaccaro
572041e6d0 am ec0c99a6: Add atrace for supporting systrace tool 
* commit 'ec0c99a6c574954fb37bd94ba18b02a20edbe122':
  Add atrace for supporting systrace tool
 2014-01-30 18:42:15 -08:00
Justin Mattson
b60a3f97d1 (DO NOT MERGE) Revert "Make libart the default runtime" 
This reverts commit 08d410f532.
 2014-01-30 15:30:08 -08:00
Nick Vaccaro
ec0c99a6c5 Add atrace for supporting systrace tool 
Change-Id: I6504a447218a70b0d148c0b5802228fb28934a0a
Signed-off-by: Nick Vaccaro <nvaccaro@google.com>
 2014-01-30 20:33:46 +00:00
Brian Carlstrom
4d662a63a4 Bump generic_mips BOARD_SYSTEMIMAGE_PARTITION_SIZE for PRODUCT_RUNTIME := libart_runtime_default 
(cherry picked from commit c8501bffcb)

Change-Id: I12ce7c4e383e74e54d77b54a0406d2499699edbf
 2014-01-28 23:43:40 -08:00
Brian Carlstrom
c8501bffcb Bump generic_mips BOARD_SYSTEMIMAGE_PARTITION_SIZE for PRODUCT_RUNTIME := libart_runtime_default 
Change-Id: I38d9cb749ec892ba0ba423b0d7c727b27b40b3db
 2014-01-28 23:34:15 -08:00
Brian Carlstrom
03e1caed18 Make libart the default runtime 
(cherry picked from commit 08d410f532)

Change-Id: I4e78a03fcd92e52f34be30726e40af287bb67309
 2014-01-28 17:41:40 -08:00