Commit graph

1121 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Elliott Hughes
3f0408695b am efb9603a: Merge "[MIPS64] Add mips64 target"
* commit 'efb9603aeb5ac71e23fa2a3ade6aa4fc2efdeb5e':
  [MIPS64] Add mips64 target
2014-02-06 20:21:41 +00: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
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
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
0b0d6277e0 am be7575ec: am cba215dd: am d21197d5: Merge "Make libart the default runtime"
* commit 'be7575ecb1827784f83582847749aa59c664d29e':
  Make libart the default runtime
2014-01-29 00:44:02 +00:00
Brian Carlstrom
be7575ecb1 am cba215dd: am d21197d5: Merge "Make libart the default runtime"
* commit 'cba215dd3241ae62416800f8d97d114d8a6e1a9a':
  Make libart the default runtime
2014-01-29 00:41:31 +00:00
Brian Carlstrom
cba215dd32 am d21197d5: Merge "Make libart the default runtime"
* commit 'd21197d50caaa025bd823a004984a2820bb3c2e2':
  Make libart the default runtime
2014-01-29 00:39:45 +00:00
Brian Carlstrom
08d410f532 Make libart the default runtime
Change-Id: I4394f2bdef6f1be36f0f17f3b42d3e62bc2245ef
2014-01-28 09:52:15 -08:00
Elliott Hughes
6fe9a94989 am 69c36ee7: am 4fbf23ef: am 0a3cf1a0: Merge "Remove libthread_db from the default include path."
* commit '69c36ee7a8c1e3d8c7ca04d61f75d95585c58253':
  Remove libthread_db from the default include path.
2014-01-28 00:59:15 +00:00
Elliott Hughes
69c36ee7a8 am 4fbf23ef: am 0a3cf1a0: Merge "Remove libthread_db from the default include path."
* commit '4fbf23ef8267849ce88217a256b394de3904a4f6':
  Remove libthread_db from the default include path.
2014-01-28 00:54:33 +00:00
Elliott Hughes
4fbf23ef82 am 0a3cf1a0: Merge "Remove libthread_db from the default include path."
* commit '0a3cf1a0e5c6dbe132c1dc5e13293960c5e7b103':
  Remove libthread_db from the default include path.
2014-01-28 00:43:29 +00:00
Elliott Hughes
2f8dcdd961 Remove libthread_db from the default include path.
This should never have been on the default include path.

The NDK statically links its own libthread_db, so I'm removing
bionic's unused copy from devices.

Bug: 11882807
Change-Id: I49a67fe0902cc4bc178360f6c993959774d74e3a
2014-01-27 15:45:17 -08:00
Colin Cross
de89397b16 am 5119fcfc: am f81cc531: am d5227a83: Merge "build: rename aarch64 target to arm64"
* commit '5119fcfc2052e9f3a5d4415759fb5bf252d651e8':
  build: rename aarch64 target to arm64
2014-01-24 20:48:20 +00:00
Colin Cross
5119fcfc20 am f81cc531: am d5227a83: Merge "build: rename aarch64 target to arm64"
* commit 'f81cc531b41617b91ef2c46b7f2fb1bf1abb8dc7':
  build: rename aarch64 target to arm64
2014-01-24 20:45:41 +00:00
Colin Cross
f81cc531b4 am d5227a83: Merge "build: rename aarch64 target to arm64"
* commit 'd5227a833cde624532ec34e8b25c29af001e427f':
  build: rename aarch64 target to arm64
2014-01-24 12:42:35 -08:00
Colin Cross
4f0eb7d50c build: rename aarch64 target to arm64
Rename aarch64 build targets to arm64.  The gcc toolchain is still
aarch64.

Change-Id: Ia92d8a50824e5329cf00fd6f4f92eae112b7f3a3
2014-01-23 22:39:38 -08:00
David Turner
82064659b8 am 327c3fef: am fa2c68e8: am 51c47855: Merge "Vibra: compile and stage vibrator.default on all targets"
* commit '327c3fef766052c4e8d492d2102a39deb3bdcaa4':
  Vibra: compile and stage vibrator.default on all targets
2014-01-24 05:47:17 +00:00
David Turner
2ae1c269a7 am 146cce0e: am cdecaca3: am dfc140cd: Merge "Vibra: emulator: compile and stage vibrator.goldfish"
* commit '146cce0ebccd5381dad9394dad350f968652c23a':
  Vibra: emulator: compile and stage vibrator.goldfish
2014-01-24 05:47:17 +00:00
David Turner
327c3fef76 am fa2c68e8: am 51c47855: Merge "Vibra: compile and stage vibrator.default on all targets"
* commit 'fa2c68e81a356556298f7bab21a29c14f99f3051':
  Vibra: compile and stage vibrator.default on all targets
2014-01-24 05:44:04 +00:00
David Turner
146cce0ebc am cdecaca3: am dfc140cd: Merge "Vibra: emulator: compile and stage vibrator.goldfish"
* commit 'cdecaca3017e902002627e68d40d09f00224baf8':
  Vibra: emulator: compile and stage vibrator.goldfish
2014-01-24 05:44:03 +00:00
David Turner
fa2c68e81a am 51c47855: Merge "Vibra: compile and stage vibrator.default on all targets"
* commit '51c47855f01223b88e1eb134504782695867301f':
  Vibra: compile and stage vibrator.default on all targets
2014-01-23 21:36:34 -08:00
David Turner
cdecaca301 am dfc140cd: Merge "Vibra: emulator: compile and stage vibrator.goldfish"
* commit 'dfc140cd3f31b4f02c807cc1aa6e85d8db87a324':
  Vibra: emulator: compile and stage vibrator.goldfish
2014-01-23 21:36:33 -08:00
David Turner
51c47855f0 Merge "Vibra: compile and stage vibrator.default on all targets" 2014-01-24 05:33:09 +00:00
David Turner
dfc140cd3f Merge "Vibra: emulator: compile and stage vibrator.goldfish" 2014-01-24 05:32:54 +00:00
David Wagner
4e0ee6c74a Vibra: compile and stage vibrator.default on all targets
Add the vibrator.default package to all targets deriving from
generic_no_telephony, i.e. virtually all targets.

This change is related to other changes in:
 - hardware/libhardware
 - hardware/libhardware_legacy
 - frameworks/base
 - device/generic/goldfish

Change-Id: Ic8464844e12f7d31ca49597dfc4995b13e9ff419
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Signed-off-by: David Wagner <david.wagner@intel.com>
Author-tracking-BZ: 94611
2014-01-10 13:56:20 +01:00
Narayan Kamath
f57caaa32e am fa0e1626: am 6ab8c86b: am 8530e25f: Merge "Remove libSR_AudioIn from base.mk"
* commit 'fa0e1626bdd0964f6f9665c41df66ef27ef32caf':
  Remove libSR_AudioIn from base.mk
2014-01-08 10:10:02 +00:00
Narayan Kamath
fa0e1626bd am 6ab8c86b: am 8530e25f: Merge "Remove libSR_AudioIn from base.mk"
* commit '6ab8c86b56a5914f30f95b73ab906de3295da03e':
  Remove libSR_AudioIn from base.mk
2014-01-08 10:07:49 +00:00
Narayan Kamath
6ab8c86b56 am 8530e25f: Merge "Remove libSR_AudioIn from base.mk"
* commit '8530e25ff666987c7c968c2a323a8b1e7867bcca':
  Remove libSR_AudioIn from base.mk
2014-01-08 02:05:12 -08:00
Narayan Kamath
8530e25ff6 Merge "Remove libSR_AudioIn from base.mk" 2014-01-08 09:59:56 +00:00
Ying Wang
c74717574f Now PRODUCT_BOOT_JARS is a list of jar names.
See commit ad6674cd60.

Change-Id: I5e45c400644b6b98dcf64d96eb2425cdbafb3021
2014-01-07 17:22:10 -08:00
Ying Wang
a292b7b02b am 83709a21: am 95fc1a50: am f12d4810: Merge "PRODUCT_BOOT_JARS as a list of jar names separated by space"
* commit '83709a21c1cd3cd30f193ebcb8001344647329e5':
  PRODUCT_BOOT_JARS as a list of jar names separated by space
2014-01-08 00:58:31 +00:00
Ying Wang
83709a21c1 am 95fc1a50: am f12d4810: Merge "PRODUCT_BOOT_JARS as a list of jar names separated by space"
* commit '95fc1a50750f8d0341e10f7ea39d37e3af5b21f3':
  PRODUCT_BOOT_JARS as a list of jar names separated by space
2014-01-08 00:53:31 +00:00
Ying Wang
95fc1a5075 am f12d4810: Merge "PRODUCT_BOOT_JARS as a list of jar names separated by space"
* commit 'f12d48104ba782d877afc31a081748fdc881f2b6':
  PRODUCT_BOOT_JARS as a list of jar names separated by space
2014-01-07 16:50:49 -08:00
Ying Wang
ad6674cd60 PRODUCT_BOOT_JARS as a list of jar names separated by space
This makes it easier for OEMs to extend the PRODUCT_BOOT_JARS in their
product configuration files.

Change-Id: I5feca2f808b1914c275f28c7a4c38cca2ba6851f
2014-01-07 14:31:49 -08:00
Narayan Kamath
8ef82240e1 Remove libSR_AudioIn from base.mk
This is an obsolete rule that was grandfathered in because
it was a USER module at some point. It's no longer
required, even by builds that use packages/app/VoiceDialer.

Change-Id: Ife9e89bd1b03c0364e27650863a83bad945b8089
2014-01-07 10:06:13 +00:00
Todd Poynor
1dd90e33f8 am a2466857: build lmkd
* commit 'a2466857412d3abe8351f7339d4b658ab0c899b8':
  build lmkd
2014-01-06 21:28:57 +00:00
Todd Poynor
a246685741 build lmkd
Change-Id: I5e7c785d3f76ec2d0f30ae6aa948436f5d04957b
2014-01-06 21:05:08 +00:00
Ying Wang
65cd1e9535 am b86c34ae: am f05eecc3: am a47d12e3: Merge "Remove LOCAL_SRC_FILES as precondition of enabling dexpreopt"
* commit 'b86c34ae64177ee725ebd3cad77c9f044a41d36c':
  Remove LOCAL_SRC_FILES as precondition of enabling dexpreopt
2014-01-04 02:05:30 +00:00
Ying Wang
f05eecc368 am a47d12e3: Merge "Remove LOCAL_SRC_FILES as precondition of enabling dexpreopt"
* commit 'a47d12e38ae38a6fdceb54172490c94408efa0de':
  Remove LOCAL_SRC_FILES as precondition of enabling dexpreopt
2014-01-03 17:59:59 -08:00
Ying Wang
9db168ca5c Remove LOCAL_SRC_FILES as precondition of enabling dexpreopt
Because a library or app can be built from mere static libraries,
or generated java files. For example, framework is built from only
static library framework-base but without LOCAL_SRC_FILES.
Also added framework2 to PRODUCT_PACKAGES.
Previously framework2.jar was installed by dependency explicitly
established in frameworks/base/Android.mk. That's not enough for the
.odex file.
This fixed the boot failure reported in bug 12382916.

Bug: 12382916
Change-Id: If1a70261ab2bb7fef77cf7b7b995bdc029be0fc3
2014-01-03 17:53:00 -08:00
Nick Kralevich
9596d11786 am 332b5f54: am 0ce68b38: am 6e8ffe3f: Merge "Allow execmem and ashmem_device execute as required."
* commit '332b5f549f355edf4d2953c588a818b4eae62bb1':
  Allow execmem and ashmem_device execute as required.
2014-01-02 20:00:03 +00:00
Nick Kralevich
0ce68b3853 am 6e8ffe3f: Merge "Allow execmem and ashmem_device execute as required."
* commit '6e8ffe3f1e328ee71354b539e63b34b2342160a8':
  Allow execmem and ashmem_device execute as required.
2014-01-02 11:54:59 -08:00
Nick Kralevich
6e8ffe3f1e Merge "Allow execmem and ashmem_device execute as required." 2014-01-02 19:50:10 +00:00
David Wagner
48b4946474 Vibra: emulator: compile and stage vibrator.goldfish
Following the new vibrator hardware module implementation, the
goldfish vibrator module is no longer integrated in the default
vibrator implementation and therefore needs to be explicitly built
for the emulator.

This patch is related to others in:
 - hardware/libhardware
 - hardware/libhardware_legacy
 - frameworks/base
 - device/generic/goldfish

Change-Id: I844279f5535289f079d412fdc44c5cb3c9c1130c
Signed-off-by: David Wagner <david.wagner@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 94611
2013-12-30 15:45:12 +01:00
Ying Wang
250e03f2a1 am 403346a8: am 06d914c8: am d23bd8f5: Merge "e2fsck missing from emulator"
* commit '403346a85085804c1de6c2586342aa90c4521f19':
  e2fsck missing from emulator
2013-12-27 20:52:19 +00:00
Ying Wang
06d914c841 am d23bd8f5: Merge "e2fsck missing from emulator"
* commit 'd23bd8f59f396ecd23a54d4e9b798bc872a2e505':
  e2fsck missing from emulator
2013-12-27 12:46:31 -08:00
Eric Frohnhoefer
0214b3fa3c e2fsck missing from emulator
The emulator file system was recently switched to ext4 however, e2fsck was not
added to the emulator build.

Change-Id: I94621c148fa40d6042b5c86a26815d867a417a6c
See: https://code.google.com/p/android/issues/detail?id=64144
2013-12-27 15:30:15 -05:00
Stephen Smalley
61c7107df3 Allow execmem and ashmem_device execute as required.
bootanim requires execmem.
bootanim and surfaceflinger requires execute to ashmem_device.

Change-Id: I3b4964c5acd31a44ce81672077c70353a375c072
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2013-12-24 11:43:25 -05:00
Nick Kralevich
66b4b43301 am 224c60c3: am da5d54c8: am dfabbc68: Merge "Add policy for x86 emulator."
* commit '224c60c337490e095d402e63961bdc8ae9ebd70c':
  Add policy for x86 emulator.
2013-12-20 21:11:15 +00:00
Nick Kralevich
da5d54c8ce am dfabbc68: Merge "Add policy for x86 emulator."
* commit 'dfabbc6863494374396a94181c408348824b37ab':
  Add policy for x86 emulator.
2013-12-20 13:06:07 -08:00
Stephen Smalley
737f9a167a Add policy for x86 emulator. 2013-12-20 14:33:55 -05:00
Ying Wang
03a06f4158 am 9507a0fd: am 82c59aef: am 71e8a22e: Merge "Add DEXPREOPT support for ART"
* commit '9507a0fd36812b27171e8f947d47421005736d25':
  Add DEXPREOPT support for ART
2013-12-18 01:03:09 +00:00
Ying Wang
82c59aefcd am 71e8a22e: Merge "Add DEXPREOPT support for ART"
* commit '71e8a22e3478b6b4277957ef47486058a5306286':
  Add DEXPREOPT support for ART
2013-12-17 16:58:43 -08:00
Brian Carlstrom
ced4bff58e Add DEXPREOPT support for ART
Change-Id: I24d0d7b2a23a769f5d69bd4dc14be22e1475b759
2013-12-17 14:44:00 -08:00
Alex Ray
c1f67e5228 DO NOT MERGE: tiny: generic product configs for super-low-mem devices
and no telephony

Change-Id: I0ab958daf810ac87bca45e3bce79b87efff128b2
2013-12-09 15:09:06 -08:00
The Android Open Source Project
722581a598 Merge commit 'd54f8c2d1b4d88db84465fee93aa29103ca32078' into HEAD
Change-Id: I3cf53f083dee277a450dac36b011bc83180f6294
2013-12-05 12:59:39 -08:00
Ying Wang
a395c6c1e4 am 18ee9e5e: Merge "Push wpa_supplicant modules down to the leaf product config."
* commit '18ee9e5e7de08933a04137e560bff87b113adb21':
  Push wpa_supplicant modules down to the leaf product config.
2013-12-05 12:25:33 -08:00
Ying Wang
730511d9c4 am 3bd3693d: Merge "Delete board config for the unused "emulator" device."
* commit '3bd3693dd0a0b514d6b1e9cbce052dee1940166b':
  Delete board config for the unused "emulator" device.
2013-12-05 12:25:32 -08:00
Ying Wang
404f32d120 am 1caa938a: Merge "Explictly set WPA_SUPPLICANT_VERSION := VER_0_8_X for the generic devices"
* commit '1caa938a22606a55103318df82a31a92f47900da':
  Explictly set WPA_SUPPLICANT_VERSION := VER_0_8_X for the generic devices
2013-12-05 12:25:31 -08:00
Ying Wang
17fc3d2ac1 Push wpa_supplicant modules down to the leaf product config.
Since 558477c0b2a5a7db679c1ad7551d43e6364d1df2 in
external/wpa_supplicant_8 we don't need those modules if
WPA_SUPPLICANT_VERSION is not set by the BoardConfig.mk.

Actually the generic devices don't need them.

Change-Id: Iff7c1fbf483bd16d5f898836c4e7401d56def80f

Conflicts:
	target/product/core_tiny.mk
2013-12-05 10:12:01 -08:00
Ying Wang
817d803c65 Delete board config for the unused "emulator" device.
Change-Id: I1e1d47fece4113be9f31f04775c5b310d28017e3
2013-12-05 10:08:10 -08:00
Ying Wang
ab6b4e0e22 Explictly set WPA_SUPPLICANT_VERSION := VER_0_8_X for the generic devices
Since 558477c0b2a5a7db679c1ad7551d43e6364d1df2 in
external/wpa_supplicant_8 we don't have WPA_SUPPLICANT_VERSION default
to VER_0_8_X.
This fixes the SDK build.

Change-Id: Ib7a8e10705dc6b987b60b1308405e89eaa2a47c9
2013-12-05 10:07:38 -08:00
Xavier Ducrohet
7a33b56429 am 8eb89dde: am ab92f3df: Add Dialer to SDK system image. DO NOT MERGE.
* commit '8eb89dde9b1c4da0aa0d116ef05e12c38873b756':
  Add Dialer to SDK system image. DO NOT MERGE.
2013-12-04 13:33:41 -08:00
Xavier Ducrohet
ab92f3dff0 Add Dialer to SDK system image. DO NOT MERGE.
Change-Id: I4f15482385c869a4ae08d99ae98bffc7c113acd7
2013-12-04 13:25:56 -08:00
The Android Open Source Project
b9041a45b1 Merge commit 'c73341006286c391ae4d268a77f5e008045d5308' into HEAD
Change-Id: I4bf7d32d65e19dfa1f0533fdd3b2295c50b13005
2013-11-22 11:06:11 -08:00
Jeff Brown
c4c92f1c73 am e17927e0: Merge "Add a platform library for remote display providers." into klp-dev
* commit 'e17927e0859778638781d75e33a3d4c5184583c4':
  Add a platform library for remote display providers.
2013-11-07 17:44:06 -08:00
Elliott Hughes
36e681b02a resolved conflicts for merge of 12f87a5b to klp-dev-plus-aosp
Change-Id: I8ce0a86bbaae0c1e3ce5ed46de628ea22ea17d16
2013-11-07 09:08:00 -08:00
Elliott Hughes
12f87a5b77 am a05365ce: Merge "Remove the hacks needed to support ash and mksh concurrently."
* commit 'a05365ceceaead86651f61f7ba66153e36b7be5d':
  Remove the hacks needed to support ash and mksh concurrently.
2013-11-07 08:35:17 -08:00
Elliott Hughes
a05365cece Merge "Remove the hacks needed to support ash and mksh concurrently." 2013-11-07 16:07:32 +00:00
Nick Kralevich
8eec26e276 am 7717bcba: am 240cd127: Merge "Move goldfish-specific policy rules to their own directory."
* commit '7717bcba28ce55bac10f6586feff89da569ff62b':
  Move goldfish-specific policy rules to their own directory.
2013-11-06 16:10:16 -08:00
Nick Kralevich
7717bcba28 am 240cd127: Merge "Move goldfish-specific policy rules to their own directory."
* commit '240cd127eb0a14515b37b2e691645a1e83ab31f9':
  Move goldfish-specific policy rules to their own directory.
2013-11-06 16:02:06 -08:00
Stephen Smalley
1d5352eaa3 Move goldfish-specific policy rules to their own directory.
Change-Id: I1bdd80f641db05fef4714654515c1e1fbb259794
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2013-11-06 10:24:14 -05:00
Jeff Brown
2cbae109be Add a platform library for remote display providers.
Bug: 11257292
Change-Id: Ia0207010c2f3ae143b483e9c1aa6643142740312
2013-11-05 22:17:57 -08:00
Elliott Hughes
32bfd70333 Remove the hacks needed to support ash and mksh concurrently.
We no longer have ash, and we'd rather not have unnecessary symbolic links
on the system.

Change-Id: Icfb1a51f1baaf1861c203f6ed93843b094deb65d
2013-11-05 11:13:49 -08:00
Alex Medina
f9f0581405 am 0068d25b: Include drawables for all densities - b/11270325
* commit '0068d25b4895162993118fe3b61d2775fa575e70':
  Include drawables for all densities - b/11270325
2013-10-18 18:17:47 -07:00
Alex Medina
0068d25b48 Include drawables for all densities - b/11270325
Change-Id: I0b1f9b930a13982756dca9428ca91aec0ef343f5
2013-10-18 13:42:42 -07:00
Jeff Sharkey
7732eb5bba am 53619434: Merge "Add blkid to all builds for use by vold." into klp-dev
* commit '53619434ed56043841256dfb2074662dbd0acc5e':
  Add blkid to all builds for use by vold.
2013-10-17 09:40:29 -07:00
Jeff Sharkey
1eb5eb1743 Add blkid to all builds for use by vold.
vold now uses blkid to extract UUID and label information from
inserted physical devices.

Bug: 11175082
Change-Id: I56ebe733ff85a498f6d3cbdcf21d40ddc6123f82
2013-10-16 16:31:57 -07:00
Jamie Gennis
1a63bb6619 am e652af1e: Merge "BoardConfig: Add and document vsync phase offset setting" into klp-dev
* commit 'e652af1e808b2b15e23bc472f9be6592735a0a8e':
  BoardConfig: Add and document vsync phase offset setting
2013-10-08 15:13:47 -07:00
Jamie Gennis
782f2ad375 BoardConfig: Add and document vsync phase offset setting
Bug: 10624956
Change-Id: I82def5730f9d09396809d4b8cd2ea44829b21f22
2013-10-07 18:01:17 -07:00