diff options
| author | Steve Kondik <shade@chemlab.org> | 2013-02-12 23:08:55 -0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2013-02-12 23:08:55 -0800 |
| commit | 012b8e877044b0e04d7ec3dfa1226fc16a953909 (patch) | |
| tree | 3c201d1bca19eeb3cb34af7fed4405b2dff8083c /target | |
| parent | 1d9caebe5ca61453ecb4b1b0f3be79d271ffa40c (diff) | |
| parent | fbef8b9578aaa422d5bd3153eb50df739815672c (diff) | |
| download | build-012b8e877044b0e04d7ec3dfa1226fc16a953909.zip build-012b8e877044b0e04d7ec3dfa1226fc16a953909.tar.gz build-012b8e877044b0e04d7ec3dfa1226fc16a953909.tar.bz2 | |
Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/build into 1.1
Android 4.2.2 release 1
Conflicts:
core/build_id.mk
core/tasks/apicheck.mk
target/product/full_base.mk
Change-Id: I085357b5573fec85b05d3fc0a86c053a647e2572
Diffstat (limited to 'target')
| -rw-r--r-- | target/product/core.mk | 1 | ||||
| -rw-r--r-- | target/product/full_base.mk | 12 | ||||
| -rw-r--r-- | target/product/mini.mk | 4 |
3 files changed, 14 insertions, 3 deletions
diff --git a/target/product/core.mk b/target/product/core.mk index da1abae..f23646a 100644 --- a/target/product/core.mk +++ b/target/product/core.mk @@ -33,7 +33,6 @@ PRODUCT_PACKAGES += \ KeyChain \ MediaProvider \ PackageInstaller \ - PhotoTable \ PicoTts \ SettingsProvider \ SharedStorageBackup \ diff --git a/target/product/full_base.mk b/target/product/full_base.mk index fe71a57..4776baa 100644 --- a/target/product/full_base.mk +++ b/target/product/full_base.mk @@ -24,6 +24,7 @@ PRODUCT_PACKAGES := \ VideoEditor \ WAPPushManager + PRODUCT_PACKAGES += \ libvideoeditor_jni \ libvideoeditor_core \ @@ -31,6 +32,17 @@ PRODUCT_PACKAGES += \ libvideoeditor_videofilters \ libvideoeditorplayer +PRODUCT_PACKAGES += \ + Galaxy4 \ + HoloSpiralWallpaper \ + LiveWallpapers \ + LiveWallpapersPicker \ + MagicSmokeWallpapers \ + NoiseField \ + PhaseBeam \ + VisualizationWallpapers \ + PhotoTable + # Additional settings used in all AOSP builds PRODUCT_PROPERTY_OVERRIDES := \ ro.com.android.dateformat=MM-dd-yyyy diff --git a/target/product/mini.mk b/target/product/mini.mk index 76d4511..b69c917 100644 --- a/target/product/mini.mk +++ b/target/product/mini.mk @@ -218,7 +218,7 @@ $(call inherit-product-if-exists, frameworks/base/data/sounds/AudioPackage5.mk) PRODUCT_PACKAGES += \ TestingCamera \ Home \ - DummySystemUI \ - DummySettings \ + SystemUI \ + Settings \ libsurfaceflinger_ddmconnection |