Commit Graph

1088 Commits

Author SHA1 Message Date
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 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 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 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
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 6da37a0fd3 am b3bc6136: Merge "arm64: don\'t build emulator"
* commit 'b3bc61365bb71cc45d10c22762aa86a3b78f1329':
  arm64: don't build emulator
2014-02-20 22:55:24 +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
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 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