Commit graph

921 commits

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

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

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

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

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

Change-Id: I4e78a03fcd92e52f34be30726e40af287bb67309
2014-01-28 17:41: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
d63d974c49 am 6fe9a949: am 69c36ee7: am 4fbf23ef: am 0a3cf1a0: Merge "Remove libthread_db from the default include path."
* commit '6fe9a94989879babb859a24fdef0b2553955cc53':
  Remove libthread_db from the default include path.
2014-01-28 01:04:55 +00: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
194c2a39be am de89397b: am 5119fcfc: am f81cc531: am d5227a83: Merge "build: rename aarch64 target to arm64"
* commit 'de89397b1636b9d77cbcdea1cfb347251e1d5b0c':
  build: rename aarch64 target to arm64
2014-01-24 21:24:54 +00: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
28e2108d9a am 82064659: am 327c3fef: am fa2c68e8: am 51c47855: Merge "Vibra: compile and stage vibrator.default on all targets"
* commit '82064659b8c56ad72f722d96733fe0b6f9ea0002':
  Vibra: compile and stage vibrator.default on all targets
2014-01-24 05:51:22 +00: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
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
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
51c47855f0 Merge "Vibra: compile and stage vibrator.default on all targets" 2014-01-24 05:33:09 +00:00
Doug Zongker
00aba87b7b add the uncrypt binary to device builds
The uncrypt binary needs to be present on any device which reboots
into recovery.

Change-Id: I684a279484876e8a596829e41218095a793ea26b
2014-01-16 12:45:21 -08: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
Vinit Deshapnde
af5ad49846 Move Wifi services to a new git project
Bug: 12175455
Change-Id: I1fa07e29c6a9aae38d9e334d519a9f2445d15613
2014-01-08 10:43:31 -08:00