Commit Graph

829 Commits

Author SHA1 Message Date
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 ba46260f8d Merge "Runtime resource overlay, iteration 2" 2014-02-11 19:27:59 +00:00
David 'Digit' Turner 145562fcef Merge "Add missing font files to SDK system images." 2014-02-10 11:31:18 +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
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 08d410f532 Make libart the default runtime
Change-Id: I4394f2bdef6f1be36f0f17f3b42d3e62bc2245ef
2014-01-28 09:52:15 -08: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 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 51c47855f0 Merge "Vibra: compile and stage vibrator.default on all targets" 2014-01-24 05:33:09 +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 8530e25ff6 Merge "Remove libSR_AudioIn from base.mk" 2014-01-08 09:59:56 +00: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
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
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
Brian Carlstrom ced4bff58e Add DEXPREOPT support for ART
Change-Id: I24d0d7b2a23a769f5d69bd4dc14be22e1475b759
2013-12-17 14:44:00 -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 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
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
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
Ben Cheng a698dab816 am 0b42554f: am 12eeb000: Merge "Add generic aarch64 board config and build rules."
* commit '0b42554fd8c7a43ca45504e4586f1eef578308de':
  Add generic aarch64 board config and build rules.
2013-10-07 14:42:10 -07:00
Ben Cheng 0b42554fd8 am 12eeb000: Merge "Add generic aarch64 board config and build rules."
* commit '12eeb000601883256f306c2c6932cda4d768e97a':
  Add generic aarch64 board config and build rules.
2013-10-07 14:40:42 -07:00
Ben Cheng db4fc200c4 Add generic aarch64 board config and build rules.
Change-Id: I8b4a377596705dfa0a3bd234162d183ec2ae9530
2013-10-07 13:58:27 -07:00
Justin Koh b49641c4fd am 752cd60d: Merge "Move DownloadProviderUi from core_minimal to core.mk" into klp-dev
* commit '752cd60d468136d95b9a040eede9e5ff884820a4':
  Move DownloadProviderUi from core_minimal to core.mk
2013-10-02 16:17:50 -07:00
Ying Wang 6a6db9432f am ab7b53b8: am 5d92a933: Merge "x86_64: Adding new target"
* commit 'ab7b53b8e09e3d346384a5257e8f7a440a53dfc0':
  x86_64: Adding new target
2013-10-02 15:06:02 -07:00
Ying Wang ab7b53b8e0 am 5d92a933: Merge "x86_64: Adding new target"
* commit '5d92a933dcc1a9ddb99b8818c8a13e208ffc22ce':
  x86_64: Adding new target
2013-10-02 15:02:51 -07:00
Justin Koh 066375a869 Move DownloadProviderUi from core_minimal to core.mk
Move DownloadProviderUi from core_minimal to core.mk. This UI requires
DocumentsUi so it doesn't make sense to ship it on devices which are only
using core_minimal.

Change-Id: Id8a4f2a9835a05e9281596dbd5ca7b8e76062cd4
2013-10-02 14:32:15 -07:00
Pavel Chupin fd82a49e04 x86_64: Adding new target
Add x86_64 Android builds. Compiler is expected to be able to understand
-m64 code generation option.

Change-Id: I99e7337c5a5766afc5e528a481bd21631ff44dd5
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
2013-10-02 20:58:54 +04:00
Ben Gilad 1da0541b7b am d7992e95: Replace a dangling refeence to packages/apps/Phone.
* commit 'd7992e95879535fbb7034c1f8e86460027f4ea04':
  Replace a dangling refeence to packages/apps/Phone.
2013-10-02 09:35:16 -07:00
Ben Gilad d7992e9587 Replace a dangling refeence to packages/apps/Phone.
Change-Id: I47b68510d19ccbaa2fc125c2a422fd1e857ec18e
2013-09-30 16:54:17 -07:00
Brian Carlstrom a0cf24a805 am 71fc41df: Enable art for user builds
* commit '71fc41df1eea345949e8e838b573ac367a52f9c7':
  Enable art for user builds
2013-09-19 16:03:32 -07:00
Brian Carlstrom 71fc41df1e Enable art for user builds
Bug: 10069754
Change-Id: Iaaff33a97bd7b68b2e8d84cd0034b15dde8a4316
2013-09-19 15:07:28 -07:00
Brian Carlstrom cd3641fab2 am 24cffbac: Merge "Add oatdump for ART to go with dexdump for Dalvik" into klp-dev
* commit '24cffbac65dfc1dd17f45dc008abc36140c81032':
  Add oatdump for ART to go with dexdump for Dalvik
2013-09-17 23:43:55 -07:00
Brian Carlstrom 24cffbac65 Merge "Add oatdump for ART to go with dexdump for Dalvik" into klp-dev 2013-09-18 06:41:37 +00:00
Jean-Michel Trivi 9532dca41f am 22b85cc1: Merge "Add loudness enhancer to platform" into klp-dev
* commit '22b85cc1144b0710a611ac8e0568b73fe3a52368':
  Add loudness enhancer to platform
2013-09-17 18:53:08 -07:00
Jean-Michel Trivi 22b85cc114 Merge "Add loudness enhancer to platform" into klp-dev 2013-09-18 01:48:35 +00:00
Brian Carlstrom 0354c908e2 Add oatdump for ART to go with dexdump for Dalvik
Bug: 10807447
Change-Id: I48d1bc0ca025215383161dbf160d4f9270d97496
2013-09-17 18:29:29 -07:00
Michael Jurka c0db1fb812 am f52651ef: Merge "Add default WallpaperCropper to the build" into klp-dev
* commit 'f52651ef2791292ba6c50f98a6558e9e0a3b0b61':
  Add default WallpaperCropper to the build
2013-09-16 12:16:53 -07:00
Michael Jurka f52651ef27 Merge "Add default WallpaperCropper to the build" into klp-dev 2013-09-16 19:13:56 +00:00
Jeff Sharkey 6c4acc1135 am f8068c2f: Remove Terminal for now.
* commit 'f8068c2fbcd149547f4c6e35a091745927712a22':
  Remove Terminal for now.
2013-09-16 10:45:09 -07:00
Jeff Sharkey f8068c2fbc Remove Terminal for now.
Bug: 10780928
Change-Id: Iab3991e8d7df7d29e108e389ea18702c5e7efa25
2013-09-16 10:37:36 -07:00