Ben Murdoch
0646fdae67
Fix SDK build.
...
Ensure that we include the Chromium-WebView resources.
Change-Id: I3f7b4e52ebb59fa6a8952839bb071c7994505b75
2013-04-02 18:20:50 +01:00
Raph Levien
cbdfc8ee7f
am a1eb76ae
: am 59fa08bd
: Merge "Switch Indic fonts to Noto" into jb-mr2-dev
...
* commit 'a1eb76aeb6d3df64b960ad47b60f408765c52069':
Switch Indic fonts to Noto
2013-03-29 14:35:15 -07:00
Raph Levien
59fa08bd3c
Merge "Switch Indic fonts to Noto" into jb-mr2-dev
2013-03-29 17:43:08 +00:00
Raph Levien
ddfb58bfde
Switch Indic fonts to Noto
...
This patch changes the fonts actually installed on the device from
the older cibu and lohit fonts to the new noto ones. Note that the
decision of whether to include the fonts based on device profile
is in the fonts.mk of the individual font projects.
Change-Id: I8b9dced0cf5bef3f8a011f925c263c346f49e407
2013-03-29 10:22:31 -07:00
Benoit Goby
d96f8a6c70
Merge "Add reboot to build"
2013-03-29 03:13:42 +00:00
Jean-Baptiste Queru
53317aebaf
am 0be63397
: am 7716c2a3
: Fix build - Add missing backslash
...
* commit '0be633973d8e0e0be4b0b99f8f09bcac295341c8':
Fix build - Add missing backslash
2013-03-26 14:26:06 -07:00
Jean-Baptiste Queru
7716c2a3bd
Fix build - Add missing backslash
...
Change-Id: Ic27b8cf0d144bb32fc757f4a01141bba3280307b
2013-03-26 14:21:33 -07:00
Jean-Baptiste Queru
e9c690e858
am 6c7d0605
: am 324c1235
: Rename AOSP builds to aosp_*
...
* commit '6c7d0605de994621aa9b3b814951955ac590169a':
Rename AOSP builds to aosp_*
2013-03-26 14:15:00 -07:00
Jean-Baptiste Queru
324c123500
Rename AOSP builds to aosp_*
...
Change-Id: If609f66904ac560bc7a6e9ff9a43c2e039525687
2013-03-26 14:06:30 -07:00
Benoit Goby
dc75794ec2
Add reboot to build
...
reboot is not a symlink to toolbox anymore and is built separately
Change-Id: I1ded0b46650eeb6365ded86dee1a58d2b0c903e6
2013-03-25 21:26:02 -07:00
Lorenzo Colitti
98a338f9a4
am a46802b1
: am 6aaf5895
: Include clatd in device builds.
...
* commit 'a46802b1ec5e02f133349213fd6cc82849902418':
Include clatd in device builds.
2013-03-17 16:27:57 +00:00
Lorenzo Colitti
6aaf5895ec
Include clatd in device builds.
...
Bug: 8276725
Change-Id: I6a4e9c9829ef676c6a3080c03a709be3ec863de5
2013-03-16 09:48:11 +09:00
keunyoung
8a3358d9bf
am f4e2151a
: am 7a697dd3
: Merge "add camera.goldfish.jpeg to emulator targets and mini targets" into jb-mr2-dev
...
* commit 'f4e2151a3c0e1f209d027a6ad7d6cb0225019b37':
add camera.goldfish.jpeg to emulator targets and mini targets
2013-03-14 23:05:15 +00:00
keunyoung
7a697dd3f5
Merge "add camera.goldfish.jpeg to emulator targets and mini targets" into jb-mr2-dev
2013-03-14 22:59:28 +00:00
keunyoung
d9b0e80c1d
add camera.goldfish.jpeg to emulator targets and mini targets
...
- For mini targets, it is for making camera work in mini-emulator targets
Change-Id: I0bebb3ae9135c78af8ba4209ba2ba60e074325b3
2013-03-14 15:35:33 -07:00
Raphael Moll
fc0d3f13bb
am 85754ea5
: am cdfb5bac
: resolved conflicts for merge of a3aea5b6
to jb-mr2-dev
...
* commit '85754ea5f2ebd118d621a9b553edb4e8763001c4':
Build SDK using prebuilts/devtools.
2013-03-14 19:49:54 +00:00
Raphael Moll
cdfb5bac3a
resolved conflicts for merge of a3aea5b6
to jb-mr2-dev
...
Change-Id: I4ff0adb3f9d9b5ae293c4903569e871ac5f2e9ae
2013-03-14 12:42:04 -07:00
Raphael Moll
8a2b7707dd
Build SDK using prebuilts/devtools.
...
Cleans up some unused/renamed files:
- sdk_only_whitelist is better named windows_sdk_whitelist.
- a few product.mk dependencies should not be listed here
any more but in the sdk/product.mk instead (which they were.)
Change-Id: Ifad3049321c8ec4edd8b94b83e570eebba442e7d
2013-03-13 15:30:35 -07:00
keunyoung
5fc6da8a97
am a9dafdb8
: am 51e11eea
: Merge "reflect the migration of emulator hal to device/generic/goldfish" into jb-mr2-dev
...
* commit 'a9dafdb8ae1730e63928e98974d3bbb3fa3a02f5':
reflect the migration of emulator hal to device/generic/goldfish
2013-03-11 21:52:43 +00:00
keunyoung
fe30957867
reflect the migration of emulator hal to device/generic/goldfish
...
- no longer need to check the presence as device/generic/goldfish is in PDK
Change-Id: I551dd283fb6511d8ebd45a8519f797f8ba2f1a05
2013-03-11 09:41:17 -07:00
Ying Wang
e91abf9e64
am 0d8411c7
: am 90701299
: am 11872e25
: am c47bea9d
: Merge "Remove nonexisting module names."
...
* commit '0d8411c792f97e3a40228b786cef4162a47e43ae':
Remove nonexisting module names.
2013-03-08 03:01:55 +00:00
Ying Wang
90701299aa
am 11872e25
: am c47bea9d
: Merge "Remove nonexisting module names."
...
* commit '11872e259252ffa45874c8e3ebe38a3c41bbd579':
Remove nonexisting module names.
2013-03-07 18:57:52 -08:00
Ying Wang
c47bea9dd9
Merge "Remove nonexisting module names."
2013-03-08 02:30:48 +00:00
Ying Wang
512b9628b0
Remove nonexisting module names.
...
Change-Id: I825de45f1b982e4aa391b11bf18ba90432272fa7
2013-03-07 18:29:56 -08:00
Christopher Ferris
161e0ef974
Merge "Adding TARGET_CPU_VARIANT to config file."
2013-03-08 02:18:08 +00:00
Christopher Ferris
6103fd7ac3
Adding TARGET_CPU_VARIANT to config file.
...
Adding this since all arm builds will require TARGET_CPU_VARIANT
to be set to a valid value in the near future.
Merge from internal master.
Change-Id: I2b73f9dbdd04cd8ac47035875c714bd0e75920e7
2013-03-07 18:12:50 -08:00
Ying Wang
20178b4f3d
am fc6be460
: am 4781e30a
: resolved conflicts for merge of de949b11
to jb-mr2-dev
...
* commit 'fc6be460ca512965aa97cc79756644db8bbe1e72':
Add module names to emulator PRODUCT_PACKAGES.
2013-03-08 02:05:17 +00:00
Ying Wang
4781e30a96
resolved conflicts for merge of de949b11
to jb-mr2-dev
...
Change-Id: I5a4c8cefeaf9e2f27be4b7ed8e4b30cb5a83a2f5
2013-03-07 18:00:03 -08:00
Justin Ho
f59f0ac640
am a3ae08b1
: am 49ffc520
: Merge "Add fr_CA to l10n builds Bug: 7579865" into jb-mr2-dev
...
* commit 'a3ae08b134f7110b1481fa82be401df70e41f6b0':
Add fr_CA to l10n builds Bug: 7579865
2013-03-07 20:38:10 +00:00
Justin Ho
d082d6730d
Add fr_CA to l10n builds
...
Bug: 7579865
Change-Id: I92c1368b97ced96cacc560d829707b9b7de69ef4
2013-03-07 12:27:44 -08:00
Jeff Sharkey
a3557b473e
Merge "Add Terminal app to build."
2013-03-06 21:42:56 +00:00
Jeff Sharkey
46ca36a015
Add Terminal app to build.
...
Change-Id: Iec08640c5606907e00276694ccfadc654224c4c2
2013-03-06 11:52:30 -08:00
keunyoung
bb7bbd97f8
am 7475afa6
: am 42e05e04
: Merge "remove reference of emulator vold.fstab which is no longer necessary" into jb-mr2-dev
...
* commit '7475afa6991a93f66c45e98e11c408c601a48b7b':
remove reference of emulator vold.fstab which is no longer necessary
2013-03-06 16:49:54 +00:00
keunyoung
42e05e040e
Merge "remove reference of emulator vold.fstab which is no longer necessary" into jb-mr2-dev
2013-03-06 02:05:56 +00:00
keunyoung
d6e63b3ab5
remove reference of emulator vold.fstab which is no longer necessary
...
Change-Id: I2c8d28060e8204ecbe255cb1e2752e3030dc2d99
2013-03-05 17:44:10 -08:00
keunyoung
d281f1aa30
am a67b5aee
: am c3eb68c4
: pull goldfish specific stuffs from emulator.mk
...
* commit 'a67b5aeeb84d4fb368eea4e939cd5ecad1b12760':
pull goldfish specific stuffs from emulator.mk
2013-03-06 00:40:08 +00:00
keunyoung
c3eb68c4ba
pull goldfish specific stuffs from emulator.mk
...
- init.goldfish.rc, init.goldfish.sh, and ueventd.goldfish.rc
Change-Id: Ia4a12477faf727c4e2276313d6d9dcf7ea430b22
2013-03-05 14:19:09 -08:00
Ying Wang
eabb34fb90
Merge "Move emulator.mk out of full_base.mk" into jb-mr2-dev
2013-03-05 07:09:37 +00:00
Ying Wang
e8f5406582
Move emulator.mk out of full_base.mk
...
Instead we should have the emulator products (full, full_mips, full_x86,
sdk) inherit from emulator.mk directly, because full_base.mk is also
inherited by real device products, such as full_manta.mk.
Change-Id: I475f7262eaa65dd85fc844ed357547c76c82598f
2013-03-04 23:08:01 -08:00
Ying Wang
83c23e69d8
Move emulator.mk out of full_base.mk
...
Instead we should have the emulator products (full, full_mips, full_x86,
sdk) inherit from emulator.mk directly, because full_base.mk is also
inherited by real device products, such as full_manta.mk.
Change-Id: I6f5f9255c73be8a4cfad7ddf88c4b633b05a7091
2013-03-04 22:55:22 -08:00
Ken Sumrall
d4c6ff727d
am 6d12cbc5
: am d5198cbc
: Merge "Install a unified fstab in the emulator image" into jb-mr2-dev
...
* commit '6d12cbc5bc8df4a86da262564a59985da97b9741':
Install a unified fstab in the emulator image
2013-03-05 03:19:02 +00:00
Ken Sumrall
d5198cbcce
Merge "Install a unified fstab in the emulator image" into jb-mr2-dev
2013-03-05 03:14:27 +00:00
Ken Sumrall
f151d3718b
Install a unified fstab in the emulator image
...
Also, modify the sdk.mk file to undo an earlier change
to add the unified fstab there, and move the include
of the emulator.mk file to after PRODUCT_COPY_FILES
is initially defined.
Change-Id: I7318ebefa1b3043f32e99a9e278fe4667f760aa8
2013-03-04 18:30:52 -08:00
Dave Langemak
f95fc3d0d9
am d8eb27bf
: Add pseudolanguage codes to l10n builds bug: 8299925
...
* commit 'd8eb27bf6a532bf6cd1343c288a34845a1c13e0a':
Add pseudolanguage codes to l10n builds bug: 8299925
2013-03-02 00:25:59 +00:00
Dave Langemak
d8eb27bf6a
Add pseudolanguage codes to l10n builds
...
bug: 8299925
Change-Id: Id4bab811bc3f6660f4ce0a21afb689366d80d795
2013-03-01 14:16:29 -08:00
Ying Wang
962d06ef65
Add module names to emulator PRODUCT_PACKAGES.
...
Instead of using "LOCAL_MODULE_TAGS := debug" to install them.
Bug: 8276818
Change-Id: I7eba3c4e6c2f07ebe661522cb0e14afcc3ef7e92
2013-02-28 16:45:41 -08:00
Ken Sumrall
7c0154447e
am e4a045e9
: Install a unified fstab for the sdk image
...
* commit 'e4a045e9e65a35d89c1139e16efb15a0fcdc27fd':
Install a unified fstab for the sdk image
2013-02-28 22:37:29 +00:00
Ken Sumrall
e4a045e9e6
Install a unified fstab for the sdk image
...
Change-Id: I95ed5ee83783dfce110c1f07b187d4624be9a735
2013-02-27 16:20:56 -08:00
Jim Miller
45e6494d2d
Add Keyguard package to platform builds.
...
Change-Id: I0a6e11bbdad2ba65c9f7ed27b4417f5243eea03d
2013-02-27 14:01:38 -08:00
Christopher Ferris
310e4b2fcc
Merge "Adding TARGET_CPU_VARIANT to config file."
2013-02-23 01:33:53 +00:00
Christopher Ferris
6d7c03bfc3
Adding TARGET_CPU_VARIANT to config file.
...
Adding this since all arm builds will require TARGET_CPU_VARIANT
to be set to a valid value in the near future.
Bug: 8005082
Change-Id: I5b945a36c10e0095bccbe453f7652da08ebc6162
2013-02-22 17:24:25 -08:00
Geremy Condra
09d232e977
Revert "Remove ping."
...
This reverts commit 68007028fd
Change-Id: I07ff0d756dff12472633e535c51a29b9062cc3fc
2013-02-22 19:37:38 +00:00
Geremy Condra
68007028fd
Remove ping.
...
This is being done to clear the way for NO_NEW_PRIVS.
Change-Id: I3f642de5c1a1febfe4db39406f3ef15b99482993
2013-02-21 13:43:25 -08:00
Ying Wang
d3aab738de
Use BUILD_PREBUILT to install the cmds.
...
Change-Id: Idd7308d653653387ee3ff4384ee428bc3c663c8b
2013-02-19 16:43:12 -08:00
Dianne Hackborn
1638ffb384
Add new "wm" command.
...
Change-Id: I2415b7696b1d310233a5202b42df5f80f02f4b9f
2013-02-19 12:09:00 -08:00
Doug Zongker
ba25690f00
Merge "factor core.mk product definition"
2013-02-17 15:08:41 +00:00
Ying Wang
0c480c0513
am aa80cac8
: am cdacb378
: Merge "[MIPS] Use mksh for /system/bin/sh"
...
* commit 'aa80cac8d31ad76111de6f8e718b3e7c27a7d31a':
[MIPS] Use mksh for /system/bin/sh
2013-02-15 15:54:32 -08:00
Doug Zongker
3f9649492b
factor core.mk product definition
...
Split core.mk, which is currently set up for phones and tablets, into
a core.mk and core_minimal.mk, so that non-phone devices can inherit
from core_minimal. The only change to products that inherit from
core.mk is removal of duplicated SELinux packages (which were present
in both core.mk and embedded.mk).
Change-Id: I6787bc42a6495c89ed63df7964512207a930d153
2013-02-15 14:40:12 -08:00
Chris Dearman
1272b7872a
[MIPS] Use mksh for /system/bin/sh
...
Signed-off-by: Chris Dearman <chris@mips.com>
Change-Id: I01a6c1e2ac9de5b6d86c2aace041a0f7400f6b5e
2013-02-15 14:00:18 -08:00
Elliott Hughes
b2bbff7cba
am ea852f6e
: am f6b670b7
: Merge "Remove more always-true ARCH_ARM_HAVE_ flags."
...
# Via Android Git Automerger (1) and others
* commit 'ea852f6ed3e9f251eaef4f041fbc0b09229ac924':
Remove more always-true ARCH_ARM_HAVE_ flags.
2013-02-14 17:31:40 -08:00
Elliott Hughes
03d2aa4dd0
Remove more always-true ARCH_ARM_HAVE_ flags.
...
All the remaining flags appear to be actually used.
Change-Id: I0e3d84915487eda4f0e97809fc36624fef5f1848
2013-02-14 12:04:48 -08:00
James Dong
3373e65316
Merge "Build libstagefright_soft_vpxenc.so by default"
2013-02-13 18:18:47 +00:00
Ben Murdoch
bb094c59f1
Merge "Include Chromium resource overlay."
2013-02-12 17:49:37 +00:00
James Dong
471f851141
Build libstagefright_soft_vpxenc.so by default
...
Change-Id: I73a0678446cb392c14cf152c884f94a24a8d8d0d
2013-02-12 09:41:00 -08:00
Dianne Hackborn
1f98681dee
New "Shell" apk is required for all builds.
...
Change-Id: Ica492ea46e0cd23d0d113cd9513e054d8695e130
2013-02-11 15:36:26 -08:00
Ben Murdoch
1d3f06abd0
Include Chromium resource overlay.
...
Resource needed by the Chromium powered WebView are defined in
an overlay in the frameworks/webview project.
See also Ifa00bae10118659c03c049d2a51f350144fe56a7 which adds the
first version of the overlay.
Change-Id: I846334fbb8be865356c566ea22a0090623be0c90
2013-02-08 17:01:26 +00:00
Ying Wang
f05c4f7524
Resurrect generic_armv5
...
But only for unbundled build.
Add it to tapas arch options.
Bug: 8108463
Change-Id: I53cd63c6ab2113fee3992650b561658231ea9921
2013-01-31 11:43:14 -08:00
Wink Saville
554a0adfb7
Delete frameworks/base/voip use voip-common from frameworks/opt/net/voip
...
Add voip-common to various files so that its available when booting
and building. Basically everyplace telephony and mms-common where needed
voip-common was added.
In core/pathmap.mk voip is removed as it is no longer in frameworks/base.
Change-Id: Ieaba759a0f69b45c4b8839cbed1fe757cdf190c5
2013-01-28 15:30:58 -08:00
Chiao Cheng
44a30c1969
Move Dialer app from core to telephony product target.
...
Bug: 8014407
Change-Id: I76ca58c4cbf05ebbd64131c17075ad4b8a919326
2013-01-17 13:03:19 -08:00
Ying Wang
66dc4c2fb7
resolved conflicts for merge of e016e80c to jb-mr1-dev-plus-aosp
...
Change-Id: Ic1546db5d009307789e0c7fda811982f80655dea
2013-01-10 14:28:56 -08:00
Jean-Baptiste Queru
b81bc6842e
am 7a184cb7
: Merge "Change Email2 reference back to Email"
...
* commit '7a184cb70f7fbdf7f9f64b88338dcd155cfe1e3d':
Change Email2 reference back to Email
2013-01-08 08:13:50 -08:00
Roger Chen
15df8356ec
Change Email2 reference back to Email
...
Change-Id: Id07d81793d2921be95b30f608cc558312f210c4e
Signed-off-by: Roger Chen <cxr514033970@gmail.com>
2013-01-08 21:48:41 +08:00
Chris Wren
dba068e1ff
am f28aae60
: am abc791fc
: am 801a0792
: Merge "unbundle photo dreams into the GalleryGoogle package" into jb-mr1.1-dev
...
* commit 'f28aae60adb462bba0cfe26ccf9ca80121ca1b7d':
unbundle photo dreams into the GalleryGoogle package
2012-12-03 18:01:14 -08:00
Chris Wren
f28aae60ad
am abc791fc
: am 801a0792
: Merge "unbundle photo dreams into the GalleryGoogle package" into jb-mr1.1-dev
...
* commit 'abc791fc5723bee48763a67a497ae25ac203b65b':
unbundle photo dreams into the GalleryGoogle package
2012-12-03 17:59:25 -08:00
Chris Wren
abc791fc57
am 801a0792
: Merge "unbundle photo dreams into the GalleryGoogle package" into jb-mr1.1-dev
...
* commit '801a079269d78e29c105462518dd4876dd031b2e':
unbundle photo dreams into the GalleryGoogle package
2012-12-03 17:56:51 -08:00
Chris Wren
d2827ae0a8
unbundle photo dreams into the GalleryGoogle package
...
Bug: 7559766
Change-Id: I805ba625b6bfc4378ffabfa1d09edab1930dc913
2012-12-03 11:36:55 -05:00
Jesse Hall
527e6127a6
am 8eb2bad5
: am f8728e66
: Merge "Add emulator modules to PRODUCT_PACKAGES in full and sdk products"
...
* commit '8eb2bad59852fddbf7cd77ccdb18411691c6c0f1':
Add emulator modules to PRODUCT_PACKAGES in full and sdk products
2012-11-29 10:22:46 -08:00
Jesse Hall
8eb2bad598
am f8728e66
: Merge "Add emulator modules to PRODUCT_PACKAGES in full and sdk products"
...
* commit 'f8728e66222a00146ba87e800ccdb776cb9e5156':
Add emulator modules to PRODUCT_PACKAGES in full and sdk products
2012-11-29 10:19:58 -08:00
Jesse Hall
229b137564
Add emulator modules to PRODUCT_PACKAGES in full and sdk products
...
Bug: 7556265
Change-Id: Ie84f5ed6b17cccea7e6181f16686e2aac6955f1a
2012-11-28 11:27:53 -08:00
Keun young Park
b549949569
am 6343d2a3
: am 490d3f24
: am d4f8d5e6
: replace dummy versions with normal ones for mini
...
* commit '6343d2a35620e1a9e1c83dd284735e50cc59c8d9':
replace dummy versions with normal ones for mini
2012-11-27 17:31:26 -08:00
Keun young Park
6343d2a356
am 490d3f24
: am d4f8d5e6
: replace dummy versions with normal ones for mini
...
* commit '490d3f24fce962c4cb98b1517f0ef1056906d587':
replace dummy versions with normal ones for mini
2012-11-27 11:35:54 -08:00
Keun young Park
490d3f24fc
am d4f8d5e6
: replace dummy versions with normal ones for mini
...
* commit 'd4f8d5e64950eb114993a9de975e1519e3509d43':
replace dummy versions with normal ones for mini
2012-11-27 11:31:50 -08:00
Keun young Park
d4f8d5e649
replace dummy versions with normal ones for mini
...
- no need to hide these UIs any more.
- dummy versions will be removed from the default manifest as well.
Change-Id: I7cebf5bfae65d2e50c9122735fd4e537f5858bec
2012-11-27 10:54:17 -08:00
Marco Nelissen
8af41153d7
Add gsm codec to the build
...
b/6620569
Change-Id: Ieb113ecc9d1195360335c29fc9d1256205cd2516
2012-11-15 16:22:39 -08:00
Xavier Ducrohet
01e774de6d
am ca75eaf0
: am 62c12cc5
: am 83c3110c
: am 1818ea8a
: Add dev settings to emulator.
...
* commit 'ca75eaf06442d51be7eb1516400d52cf095af013':
Add dev settings to emulator.
2012-11-08 06:17:39 -08:00
Xavier Ducrohet
ca75eaf064
am 62c12cc5
: am 83c3110c
: am 1818ea8a
: Add dev settings to emulator.
...
* commit '62c12cc5eb331c560cef3daf8121ae938c3e4ab0':
Add dev settings to emulator.
2012-11-08 06:14:19 -08:00
Xavier Ducrohet
62c12cc5eb
am 83c3110c
: am 1818ea8a
: Add dev settings to emulator.
...
* commit '83c3110c401fc21f6b4a47db7e9732a7b0d00e9b':
Add dev settings to emulator.
2012-11-06 17:11:58 -08:00
Xavier Ducrohet
1818ea8ae0
Add dev settings to emulator.
...
Change-Id: I0f92257c0a6ac92f3bce4ad004c3e2414ef0f9da
2012-11-06 17:03:52 -08:00
Torne (Richard Coles)
f4bbd8c1e9
Merge "Make the base product depend on webview indirectly."
2012-11-01 04:09:18 -07:00
Ying Wang
1e1a961690
Merge "Move the host tools from target/product/sdk.mk to sdk/build/product_sdk.mk"
2012-10-31 12:22:39 -07:00
Ying Wang
b34115d7db
Merge "Remove nonexistent modules from PRODUCT_PACKAGES"
2012-10-31 11:58:32 -07:00
Ying Wang
92cd50c416
Remove nonexistent modules from PRODUCT_PACKAGES
...
and revert back to fatal error if sdk has nonexistent modules.
Change-Id: Ic7185128b0253b3591592b4167ea1e26cee1aa84
2012-10-31 11:55:53 -07:00
Ying Wang
5be57b2f0d
Move the host tools from target/product/sdk.mk to sdk/build/product_sdk.mk
...
Change-Id: Ic5d1e50701c9b394a59284aa8b094bdc1fb0f96c
2012-10-31 11:25:31 -07:00
Ying Wang
0e50d89123
Add jobb and fat32lib to sdk PORUDCT_PACKAGES.
...
Change-Id: I0fb8bdc67c6b79eb3949a9e2a8de67b8c55c3af5
2012-10-31 11:06:03 -07:00
Torne (Richard Coles)
b23917737f
Make the base product depend on webview indirectly.
...
Instead of depending on libwebcore directly as part of the base product,
depend on the phony "webview" target from frameworks/webview instead, to
allow the Chromium-powered webview to override it.
Change-Id: I2f9c103a57a730b252e8a05d52c5b4c1b9711319
2012-10-31 17:10:36 +00:00
Mike Lockwood
0cbacc4b21
am 86e2fd92
: am daf5e22d
: Add new embedded target for a super minimal android build
...
* commit '86e2fd9215faaffed47ab0373b2955d9a1892113':
Add new embedded target for a super minimal android build
2012-10-26 08:47:40 -07:00
Mike Lockwood
86e2fd9215
am daf5e22d
: Add new embedded target for a super minimal android build
...
* commit 'daf5e22dbac03e174e22c8209ed97c44c3a2a2c9':
Add new embedded target for a super minimal android build
2012-10-26 08:45:36 -07:00
Mike Lockwood
daf5e22dba
Add new embedded target for a super minimal android build
...
Remove obsolete BUILD_TINY_ANDROID
Change-Id: Ic0f3a5b3250ea80529f5099653068f118a13b12e
2012-10-25 15:28:37 -07:00
Elliott Hughes
504093d727
am 0270c32b
: am 1a36c59e
: Merge "Remove tzdata from core.mk, now we have explicit dependencies."
...
* commit '0270c32bbb4af609571c92839ce41983c50d68da':
Remove tzdata from core.mk, now we have explicit dependencies.
2012-10-18 14:46:50 -07:00
Elliott Hughes
0270c32bbb
am 1a36c59e
: Merge "Remove tzdata from core.mk, now we have explicit dependencies."
...
* commit '1a36c59e41488dafe30aba1d2ccfd4ecd861c6ce':
Remove tzdata from core.mk, now we have explicit dependencies.
2012-10-18 14:44:23 -07:00
Elliott Hughes
e250ea27d1
Remove tzdata from core.mk, now we have explicit dependencies.
...
Bug: 7012465
Change-Id: I4c8aefdea49d9a21264580828146a4ae01dd1c95
2012-10-18 11:30:32 -07:00
Elliott Hughes
31d2dd3840
am 409688c3
: am 83e024c0
: Merge "Add new tzdata and tzdata-host to default product build"
...
* commit '409688c34e876c4f1ae3ed4e6132916742487942':
Add new tzdata and tzdata-host to default product build
2012-10-18 10:28:49 -07:00
Elliott Hughes
409688c34e
am 83e024c0
: Merge "Add new tzdata and tzdata-host to default product build"
...
* commit '83e024c0ba569a14ee8c19fda0b90b8ac401d81a':
Add new tzdata and tzdata-host to default product build
2012-10-18 10:26:34 -07:00
Brian Carlstrom
39ca24f6c9
Add new tzdata and tzdata-host to default product build
...
Bug: 7012465
Change-Id: I551e88f88c6f0713f2c26d34c6aa08af32b35620
2012-10-17 19:14:41 -07:00
Kenny Root
a7fa6a4607
resolved conflicts for merge of 37868329
to master
...
Change-Id: I437f42a7197d1716b4783749f2b27e19c8721395
2012-10-16 17:41:33 -07:00
Kenny Root
37868329b2
am 2e0d1af7
: Merge changes I58d43128,Ie34c958f
...
* commit '2e0d1af767f64996f47de2a84b685ddcfa02e686':
Remove HAVE_SELINUX guards, part 2
Remove HAVE_SELINUX guard
2012-10-16 17:34:42 -07:00
Christopher Tate
107257a825
am 5a708879
: am 0743f28b
: am fd671b2d
: Merge "Add the new \'settings\' shell tool to the build" into jb-mr1-dev
...
* commit '5a708879a8f3be84376bc6c444442d37d6585d13':
Add the new 'settings' shell tool to the build
2012-10-10 15:41:10 -07:00
Christopher Tate
a3f11e6e66
Add the new 'settings' shell tool to the build
...
The tool isn't useful unless it's actually built into products.
Bug 7299066
Change-Id: I9aaf37bde73a986d871eac6fd4dea15c192110cb
2012-10-10 14:13:59 -07:00
Kenny Root
2244cd322f
Remove HAVE_SELINUX guard
...
Change-Id: Ie34c958fb20757f733b6c933bfe52691f773a342
2012-10-10 11:01:02 -07:00
Elliott Hughes
01b2aaaa89
am 69a49f75
: Merge changes I21eb93f3,I0be5e272,I158b0d7e
...
* commit '69a49f75860b4849fd1c2fe68d97fa2243171131':
Build only modules required by the current product.
Load only the current product config makefile.
Run clean steps in only given paths when using mm/mmm
2012-10-03 11:55:24 -07:00
Ying Wang
0c4eb41885
Load only the current product config makefile.
...
To reduce the start time.
With the change and previous change of doing clean step in only given paths,
start time of mm/mmm is reduced from ~5s to about 1s;
lunch time is reduced from ~40s to 3.5s.
(cherry-pick of 157a5e1695593f935c3223430f4530e21f990378.)
Bug: 7186768,7169854
Change-Id: I0be5e2721efa66a80f112acf8f95e177ebc2f65b
2012-10-03 10:27:08 -07:00
Ying Wang
54fa8c3ff9
Load only the current product config makefile.
...
To reduce the start time.
With the change and previous change of doing clean step in only given paths,
start time of mm/mmm is reduced from ~5s to about 1s;
lunch time is reduced from ~40s to 3.5s.
Bug: 7186768,7169854
Change-Id: Ifd72ba1c6362a5e1125a23c505fd47947ab56675
2012-09-28 15:08:12 -07:00
Ying Wang
157a5e1695
Load only the current product config makefile.
...
To reduce the start time.
With the change and previous change of doing clean step in only given paths,
start time of mm/mmm is reduced from ~5s to about 1s;
lunch time is reduced from ~40s to 3.5s.
Bug: 7186768,7169854
Change-Id: Ifd72ba1c6362a5e1125a23c505fd47947ab56675
2012-09-27 15:17:41 -07:00
Ying Wang
b301817223
Don't install all host modules by default.
...
Instead we should explicitly set up the dependency, if the module will
be used in the build process; Use LOCAL_MODULE_TAGS with eng, debug or
tests if the module is for testing; or add to PRODUCT_PACKAGES if it's
required by a product.
Change-Id: I326e97df6630dee4acc6582ce6cef2dec8289155
2012-09-24 18:17:26 -07:00
Bart Sears
6c2eedc43f
am 01cf231c
: am 0b7e0983
: Merge "Add the new NanumGothic makefile to the build" into jb-mr1-dev
...
* commit '01cf231cbafe5cfba571535f967bcc5d1830385f':
Add the new NanumGothic makefile to the build
2012-09-24 13:10:42 -07:00
Bart Sears
0b7e0983d4
Merge "Add the new NanumGothic makefile to the build" into jb-mr1-dev
2012-09-24 13:06:06 -07:00
Siva Velusamy
0dd0e0072d
am b01402e3
: am 53e71420
: Revert "Include videoeditor_jni in sdk product build."
...
* commit 'b01402e3b47348b9b695be63b0f37162fba0caee':
Revert "Include videoeditor_jni in sdk product build."
2012-09-24 12:50:23 -07:00
Siva Velusamy
53e714209b
Revert "Include videoeditor_jni in sdk product build."
...
This reverts commit 997e629d6d
.
2012-09-24 10:24:17 -07:00
Siva Velusamy
45205ad9ac
am 918c56c7
: am 32130c6d
: Merge "Include videoeditor_jni in sdk product build." into jb-mr1-dev
...
* commit '918c56c7a157b56ea0dc037786627a8101e15cfe':
Include videoeditor_jni in sdk product build.
2012-09-24 00:49:55 -07:00
Bart Sears
04873af062
Add the new NanumGothic makefile to the build
...
There are separate CLs to add the NanumGothic font files
and makefiles.
Bug: 4531601
Change-Id: Id27f9ff6eb45f666f7f62f1dbe7a06c96c0a717e
2012-09-24 00:11:00 -07:00
Siva Velusamy
997e629d6d
Include videoeditor_jni in sdk product build.
...
frameworks/base/media depends on libvideoeditor_jni. This change
copies the dependencies from generic_no_telephony.mk
Fixes Bug 7200384
Change-Id: I135fd4fc613d81aa962bcdf2573894a2ea8ab11d
2012-09-21 14:23:50 -07:00
Zhihai Xu
adeea83673
am 0ed78ec7
: am d81b9d22
: Merge "ISSUE 6849488 Bluedroid stack, remove system/bluetooth." into jb-mr1-dev
...
* commit '0ed78ec7c4b659a1b6b0bd5e39428f882411a0ff':
ISSUE 6849488 Bluedroid stack, remove system/bluetooth.
2012-09-20 20:30:57 -07:00
Zhihai Xu
d81b9d220e
Merge "ISSUE 6849488 Bluedroid stack, remove system/bluetooth." into jb-mr1-dev
2012-09-20 16:42:47 -07:00
Zhihai Xu
3849760809
ISSUE 6849488 Bluedroid stack, remove system/bluetooth.
...
remove system/bluetooth stuff.
bug 6849488
Change-Id: I8eb85c6da0aa34aefda2916f2c74e5eae51da27e
2012-09-20 10:50:56 -07:00
Daniel Sandler
76fe970e11
am 75bfa4af
: am ed9a2106
: Merge "Remove WebViewDream from the build." into jb-mr1-dev
...
* commit '75bfa4af16d0a2a8ed60ace5358038e5e08d0f3c':
Remove WebViewDream from the build.
2012-09-18 10:44:19 -07:00
Daniel Sandler
84f3b02468
Remove WebViewDream from the build.
...
It will remain in AOSP as sample code.
Change-Id: I253034f45d7008beadf9220f6e13a76c3ead3490
2012-09-13 13:06:43 -07:00
Keun young Park
dbe4fdf7bc
am 6c03166c
: am ead692e5
: Merge "add libsurfaceflinger_ddmconnection to PRODUCT_PACKAGES for PDK build" into jb-mr1-dev
...
* commit '6c03166c3a5e5f571d47a954a8ee5a2d1d2287b8':
add libsurfaceflinger_ddmconnection to PRODUCT_PACKAGES for PDK build
2012-08-31 20:11:38 -07:00
Keun young Park
ead692e5f3
Merge "add libsurfaceflinger_ddmconnection to PRODUCT_PACKAGES for PDK build" into jb-mr1-dev
2012-08-31 20:07:29 -07:00
Daniel Sandler
37755bb1c8
am 7138e336
: am ce9ecf38
: Merge "Add basic Dreams set to builds." into jb-mr1-dev
...
* commit '7138e336dd753394ec7a008e1836891f6e0b1ca1':
Add basic Dreams set to builds.
2012-08-31 13:38:43 -07:00
Daniel Sandler
eeed3cf2c5
Add basic Dreams set to builds.
...
Change-Id: I7b7e84a84f9fc6c594662baf4dd991ff9af5f162
2012-08-31 15:57:09 -04:00
Keun young Park
59254f1194
add libsurfaceflinger_ddmconnection to PRODUCT_PACKAGES for PDK build
...
- the library is dlopened from libsurfaceflinger
Bug: 7089510
Change-Id: I5526c0390efd161e596b08c0bf823090b3969dfe
2012-08-31 10:00:53 -07:00
Chiao Cheng
833d4b304c
Merge "Adding OneTimeInitializer to build."
2012-08-30 14:44:30 -07:00
Jean-Baptiste Queru
9993b1265e
am bb369a58
: Merge "Add make_ext4fs to support installing apps to SD card"
...
* commit 'bb369a582b9756347959f6ef389507455f805df1':
Add make_ext4fs to support installing apps to SD card
2012-08-30 11:40:13 -07:00
Jun Tian
536c8bed37
Add make_ext4fs to support installing apps to SD card
...
The default createSecureContainer format is changed from fat32 to ext4 in PackageHelper::CreateSdDir in:
/frameworks/base/core/java/com/android/internal/content/PackageHelper.java
We need to add make_ext4fs into the system image to support installing apps to SD card.
In kernel, we also need to add ext4 filesystem support.
Change-Id: If4817a95663144a6bfaeeed0c7cb081063a0daad
Signed-off-by: Jun Tian <jun.j.tian@intel.com>
Signed-off-by: Liang Chen <liang.l.chen@intel.com>
Signed-off-by: Panfeng Chang <panfengx.chang@intel.com>
2012-08-30 09:53:03 -07:00
Chiao Cheng
6c7341cac9
Adding OneTimeInitializer to build.
...
Bug: 6993891
Change-Id: Id3c0275846a4dd93d82dcfde0249fec0e226a9bd
2012-08-28 18:53:00 -07:00
Chris Wren
ab42a8341c
am 00743e38
: am 07791f87
: Merge "Include stock Dreams in the build." into jb-mr1-dev
...
* commit '00743e38849df7fbc5d6a723bbd5e79658941b69':
Include stock Dreams in the build.
2012-08-28 07:13:29 -07:00
Chiao Cheng
1703f31db6
Adding new dialer application to core.
...
Bug: 6993891
Change-Id: I992d2da9a9468a803b45d956f7df16a741162787
2012-08-27 13:44:56 -07:00
Chris Wren
74931cd5c4
Include stock Dreams in the build.
...
Change-Id: I61953eeb50f8f02845468bc11c723405d5641d7f
2012-08-27 16:39:56 -04:00
Paul Westbrook
d1a9deeb9a
am f9f89461
: am 6392aeea
: Remove imap2 from build
...
* commit 'f9f8946156973f8fa8ab7bdeccbf403c8ddc80cc':
Remove imap2 from build
2012-08-22 14:59:31 -07:00
Paul Westbrook
6392aeeadb
Remove imap2 from build
...
Change-Id: I64b5db47895e99f76d30e453f4d95c9546a96839
2012-08-22 14:49:58 -07:00
Ying Wang
0d9827386d
Allow full_x86 and full_mips in unbundled build.
...
So we can do unbundled builds for x86 and mips devices.
Change-Id: Ibd8c3b0371c316b713a748a6e6ce14fe98fdc4aa
2012-08-22 10:09:22 -07:00
Keun young Park
11ab43f23f
am 6d3a1a72
: am ffa66a1a
: Merge "replace apps for PDK" into jb-mr1-dev
...
* commit '6d3a1a72729570a129500169a3749967d42e1b55':
replace apps for PDK
2012-08-20 17:29:34 -07:00
Keun young Park
14b61dac86
replace apps for PDK
...
- Launcher2 to Home
- SystemUI to DummySystemUI
- Settings to DummySettings
Change-Id: Ibeecf3d4df0dbb38737dba7503819d2b700036c1
2012-08-20 17:06:36 -07:00
Joe Onorato
cea08a5220
resolved conflicts for merge of 5836d3b3
to jb-mr1-dev
...
Change-Id: If3d84a7439717ccf7723b3f79e934d73abbb3fea
2012-08-17 00:09:27 -07:00
Joe Onorato
5836d3b3d9
am f72e34eb
: Merge changes I9d3a3c16,I17b5d441,I29e27505,Ia5ca233e,I0a0b200b,I6f412ed4,I623821df,Ifec8e63e,I12d0a847,Idac551e5,I59a88027,I2498139d,I6bd93a87
...
* commit 'f72e34ebf49ed2a06fe9e37d134f2088e2c0c0e4':
Move the old user tagged modules over to base.mk so mini and core both share them.
More product debugging.
build system changes for jb-aah-dev merge
Fail when a non-vendor product references a vendor module.
Remove support for user tags in the build system.
List the user modules explicitly, and we can get rid of the support for the user tag!
Dump the user tagged modules.
host modules don't need LOCAL_MODULE_TAGS
Don't give the user tag to host modules automatically.
Add a phony "nothing" goal that reads the makefiles but doesn't try to build anything.
Add tool to parse make dependency info from new --deps flag.
Use a more modern -j flag.
make product-graph now filtered
2012-08-16 23:50:34 -07:00
Joe Onorato
c7d6f1ca1f
Move the old user tagged modules over to base.mk so mini and core both share them.
...
Change-Id: I9d3a3c165fa56d4ca137b3c06e249e1deea6a1c5
2012-08-16 22:45:56 -07:00
Joe Onorato
8d0847e924
build system changes for jb-aah-dev merge
...
Change-Id: I29e27505a0d9f7cc2932f725bfe1c83d804388bc
2012-08-16 22:45:56 -07:00
Joe Onorato
3445f8fd1e
List the user modules explicitly, and we can get rid of the support for the user tag!
...
Change-Id: I6f412ed4e08d784ed71ec170e870fcf30081963a
2012-08-16 22:45:56 -07:00
Joe Onorato
22273e6cfe
Move the old user tagged modules over to base.mk so mini and core both share them.
...
Change-Id: I9d3a3c165fa56d4ca137b3c06e249e1deea6a1c5
2012-08-16 22:36:41 -07:00
Joe Onorato
26ead966d7
build system changes for jb-aah-dev merge
...
Change-Id: I29e27505a0d9f7cc2932f725bfe1c83d804388bc
2012-08-16 22:36:41 -07:00
Joe Onorato
8cfca47f5a
List the user modules explicitly, and we can get rid of the support for the user tag!
...
Change-Id: I6f412ed4e08d784ed71ec170e870fcf30081963a
2012-08-16 22:36:40 -07:00
Keun young Park
1dc7c65a83
am 5877c1d1
: am 81821821
: fix PDK boot issue
...
* commit '5877c1d17d34cd2eb039ec904b2bd4eb9fbd5ddd':
fix PDK boot issue
2012-08-15 12:25:39 -07:00
Keun young Park
8182182182
fix PDK boot issue
...
- add missing packages to make it boot
Change-Id: I9a4a635e67a82c326f9eb1eceb86cffc8f59a2d3
2012-08-15 11:32:23 -07:00
Jesse Hall
879778da8b
am 049d1964
: am 8513b62f
: Merge "Include FusedLocation.apk on sdk builds too" into jb-mr1-dev
...
* commit '049d1964dc3b0fab51b0f8e3debf6e1cc83c97f9':
Include FusedLocation.apk on sdk builds too
2012-08-14 15:34:46 -07:00
Jesse Hall
9d04cc4ef2
Include FusedLocation.apk on sdk builds too
...
Bug: 6969889
Change-Id: Ifda8df58906b3e1d77de0f7de0b1dd07c6bf430f
2012-08-14 13:34:43 -07:00
Ying Wang
4000ff5611
am d88c10d7
: am f59a64b7
: am d3d0beca
: am 392bdc1f
: Merge "Move the selinux modules to core PRODUCT_PACKAGES"
...
* commit 'd88c10d7691f2717a2c1fd0801c9a7798fbe0334':
Move the selinux modules to core PRODUCT_PACKAGES
2012-08-13 16:30:15 -07:00
Ying Wang
f59a64b7cb
am d3d0beca
: am 392bdc1f
: Merge "Move the selinux modules to core PRODUCT_PACKAGES"
...
* commit 'd3d0becac9a13836b7c20acba3b21b0625d92324':
Move the selinux modules to core PRODUCT_PACKAGES
2012-08-13 16:26:06 -07:00
Ying Wang
d3d0becac9
am 392bdc1f
: Merge "Move the selinux modules to core PRODUCT_PACKAGES"
...
* commit '392bdc1f08eb03ad04eba24a76cc0aea7e1b46d6':
Move the selinux modules to core PRODUCT_PACKAGES
2012-08-13 16:24:11 -07:00
Ying Wang
82ccebaa59
Move the selinux modules to core PRODUCT_PACKAGES
...
The module names are phony targets and we should avoid having file targets
depend on phony targets.
Instead the build system makes sure to use the file dependency with
PRODUCT_PACKAGES.
Change-Id: I8dc59d8f9ed92c146b8827d71278e27214e60f3a
2012-08-13 15:40:43 -07:00
Nick Pelly
b08db2330d
am 33b8321d
: am 0de821b0
: Merge "Include FusedLocation.apk on all builds." into jb-mr1-dev
...
* commit '33b8321d2e3ba308e43fd196ce5dfc832a097a69':
Include FusedLocation.apk on all builds.
2012-08-10 18:57:54 -07:00
Nick Pelly
0de821b0b1
Merge "Include FusedLocation.apk on all builds." into jb-mr1-dev
2012-08-10 18:54:23 -07:00
Nick Pelly
48d55d3777
Include FusedLocation.apk on all builds.
...
Change-Id: Ifc98195b51971ff65e1661f89e08965daefc3506
2012-08-10 18:50:36 -07:00
Keun young Park
8ac593801a
am d4c5dd0c
: am f15a11c5
: add libstagefright_chromium_http to mini for streaming
...
* commit 'd4c5dd0ceae2e1467b98a7197d7d61a315ea6edd':
add libstagefright_chromium_http to mini for streaming
2012-08-10 18:31:25 -07:00
Keun young Park
f15a11c58d
add libstagefright_chromium_http to mini for streaming
...
Change-Id: I27da54d17698c71d36a5761c6debaeb9f55e5856
2012-08-10 16:59:54 -07:00
Ying Wang
e4ba06c35c
Allow full_x86 and full_mips in unbundled build.
...
So we can do unbundled builds for x86 and mips devices.
Change-Id: Ibd8c3b0371c316b713a748a6e6ce14fe98fdc4aa
2012-08-10 15:14:00 -07:00
Jean-Baptiste Queru
049d97d778
am 2387857d
: am 968f20a4
: Merge "MIPS support to *.mk files and envsetup.sh"
...
* commit '2387857dad06b3437ffcf0c14e2bc9f5956a5888':
MIPS support to *.mk files and envsetup.sh
2012-08-10 12:43:59 -07:00
Jean-Baptiste Queru
91afae6c03
resolved conflicts for merge of dd14acc3
to jb-mr1-dev
...
Change-Id: Ic900c623a7c7fd20c965b8d838caf0f01ceab53f
2012-08-10 12:42:18 -07:00
Jean-Baptiste Queru
2387857dad
am 968f20a4
: Merge "MIPS support to *.mk files and envsetup.sh"
...
* commit '968f20a4c2ffca9a0cf8870bd96c77e65ca61243':
MIPS support to *.mk files and envsetup.sh
2012-08-10 09:23:42 -07:00
Jean-Baptiste Queru
dd14acc3f6
am e443a9e9
: Merge "Modify full_mips-eng build in line with the full-eng build"
...
* commit 'e443a9e92f323bff5bb304e1baf8b00ed18888be':
Modify full_mips-eng build in line with the full-eng build
2012-08-10 09:23:38 -07:00
Raghu Gandham
8da4310646
MIPS support to *.mk files and envsetup.sh
...
Change-Id: Iba4d046e3202524b29cfe32980927f8cc0aa8496
Signed-off-by: Chris Dearman <chris@mips.com>
Signed-off-by: Raghu Gandham <raghu@mips.com>
2012-08-10 09:15:38 -07:00
Kenny Root
720479ea7e
Add make_ext4fs to all builds
...
make_ext4fs is needed for all builds because ASEC containers use it now.
Any product not having this will not be able to create an ASEC
container.
Bug: 6960586
Change-Id: I7c10b8065a76ec7a43f79445f429d5a93750585d
2012-08-09 12:20:16 -07:00
Ying Wang
7f9db64d0e
Merge "Add libstagefright and libstagefright_chromium_http to core.mk." into jb-mr1-dev
2012-08-03 17:46:49 -07:00
Ying Wang
c10da6c540
Add libstagefright and libstagefright_chromium_http to core.mk.
...
Bug: 6933259
Change-Id: Ibe83a95bed7679d6260ef7500c459dcd7ae71812
2012-08-03 17:44:06 -07:00
Paul Westbrook
95781f03c9
Add imap2 to the build
...
Change-Id: I9750d69b64560ad0c3285f5cebdbfe5087289f99
2012-08-03 11:47:53 -07:00
Keun young Park
add5271a56
add missing telephony libs for PDK mini config
...
Change-Id: I3a3b5d920a03e90a64d0fb78b168d9f6dac12a99
2012-08-01 15:02:35 -07:00
Chris Dearman
1603e3a987
Modify full_mips-eng build in line with the full-eng build
...
Change-Id: Iebbad0c2a4f8f01b2ff8a08ea77965291a842636
Signed-off-by: Raghu Gandham <raghu@mips.com>
2012-08-01 11:04:09 -07:00
Shih-wei Liao
b09d26a496
Add "abcc" (bitcode compiler) and "libportable" into system.img.
...
BUG=6886348. NDK on llvm requires bitcode compiler and libportable.
Change-Id: I6d45575518f312860e99e87d7b6eabc4ae7802fd
2012-07-27 23:32:26 -07:00
Elliott Hughes
b286b76da7
am f833e0a7
: am b9c2a66a
: Merge "Now zoneinfo prebuilts are Android modules."
...
* commit 'f833e0a780d576be76520c1d0b51035f589cec0b':
Now zoneinfo prebuilts are Android modules.
2012-07-27 15:51:16 -07:00
Elliott Hughes
f833e0a780
am b9c2a66a
: Merge "Now zoneinfo prebuilts are Android modules."
...
* commit 'b9c2a66a4897b9be02d53f36bf9d212141c2dfb0':
Now zoneinfo prebuilts are Android modules.
2012-07-27 15:47:34 -07:00
Ying Wang
5fb2ef65d4
Now zoneinfo prebuilts are Android modules.
...
(cherry-picked from 101d32ebb80f5f015781b98cb53739e8ad933cb4.)
Bug: 6857263
Change-Id: Ie0cd0efa4444eb0ee63a1a91890f4bb48539e7a7
2012-07-27 13:46:40 -07:00
Wink Saville
c4e790dc64
Create telephony-common and mms-common - DO NOT MERGE
...
These have been created to reduce the size and complexity
of frameworks/base.
mms-common was created by moving all of
frameworks/base/core/java/com/google/android/mms
to:
frameworks/opt/mms
telephony-common was created by moving some of
frameworks/base/telephony
to:
frameworks/opt/telephony
Change-Id: I5613c1447dbe655c55f9ba499e453bb59a06c4c0
2012-07-17 12:22:58 -07:00
Keun young Park
fb1951e2f4
add TestingCamera to mini for generic PDK
...
Change-Id: I8a04c48e173d8742bf852d242e2efc0577287608
2012-07-16 12:15:54 -07:00
Guang Zhu
fb3083ef6f
am 96d9fa29
: resolved conflicts for merge of ef1335ed
to jb-dev-plus-aosp
...
* commit '96d9fa29cd1ff48b733eb090e99fe165d194d313':
use default shell (mksh) in emulator
2012-07-12 09:36:35 -07:00
Guang Zhu
96d9fa29cd
resolved conflicts for merge of ef1335ed
to jb-dev-plus-aosp
...
Change-Id: I4da6c32635e67730ac595a2a04165f12c37c1c15
2012-07-11 19:36:17 -07:00
Guang Zhu
ef1335eda4
use default shell (mksh) in emulator
...
remove the override to use ash as shell so that mksh is the
default in 'generic' product type
Change-Id: I91d76d0fc522baf5d47096ab19ea264c9b1268e6
2012-07-11 18:35:08 -07:00
Wink Saville
a44a92914b
Merge commit 'c16c9454' into mit
...
* commit 'c16c9454':
Create telephony-common and mms-common
2012-07-11 18:08:21 -07:00
Wink Saville
c16c945497
Create telephony-common and mms-common
...
These have been created to reduce the size and complexity
of frameworks/base.
mms-common was created by moving all of
frameworks/base/core/java/com/google/android/mms
to:
frameworks/opt/mms
telephony-common was created by moving some of
frameworks/base/telephony
to:
frameworks/opt/telephony
Change-Id: I5613c1447dbe655c55f9ba499e453bb59a06c4c0
2012-07-06 18:06:36 -07:00
Marc Blank
f173c6be57
Change build targets to use Email2/Exchange2
...
Change-Id: I1b93b112b4d31ce379d33e2d1202fc90bb8d21eb
2012-06-28 16:55:57 -07:00
Keun young Park
fb8cc2d4e3
replace development/data/etc/ to device/generic/goldfish/data/etc
...
- Files under development/data/etc will be removed
Change-Id: I39907cda9b3253f1608ed3231a8a9945087348d7
2012-06-19 18:02:22 -07:00
Jean-Baptiste Queru
a644e7bb66
am 03bb0851
: Remove references to packages that don\'t exist any more.
...
* commit '03bb0851d6a86ac51becaa132f96ed1d8f4b604c':
Remove references to packages that don't exist any more.
2012-06-19 11:27:26 -07:00
Jean-Baptiste Queru
03bb0851d6
Remove references to packages that don't exist any more.
...
Those can't be found anywhere in the build system.
Change-Id: I3b3727e7735de0dbffae930cf99a6d6ccbc79570
2012-06-19 11:17:27 -07:00
Guang Zhu
d214c7e495
am 5d76a3f2
: Merge "add uiautomator into system image" into jb-dev
...
* commit '5d76a3f2d53fceb883d84d214c28c51bc3e5b43c':
add uiautomator into system image
2012-06-18 11:55:49 -07:00
Guang Zhu
e770754b9f
add uiautomator into system image
...
this includes 2 pieces:
* uiautomator shell script
* uiautomator.jar: test runner and the automation framework
classes
source is under frameworks/testing/uiautomator
Change-Id: I237d85b8917d2451cf35362d2e34786940897921
2012-06-17 00:33:08 -07:00
Jean-Baptiste Queru
12d24b5aab
resolved conflicts for merge of 76af0657
to jb-dev-plus-aosp
...
Change-Id: I4843695261abbc478fd6b505debe6fc20a06c88d
2012-06-12 14:57:27 -07:00
Bruce Beare
46b48e88fe
full_x86: use telephony profile
...
Author: Bruce Beare <bruce.j.beare@intel.com>
Change-Id: I3c086f3f38049e9a7cc2e653aa0ee0d2a2ca1a79
2012-06-12 14:34:53 -07:00
Jamie Gennis
82c11caca0
am f3b1395a
: Merge "Add atrace to core.mk" into jb-dev
...
* commit 'f3b1395a41a1f882fac74b8a55723af8f77535d0':
Add atrace to core.mk
2012-06-12 12:41:26 -07:00
Jean-Baptiste Queru
ddb706785b
am 5b7633be
: am 06e515dd
: Merge "This patch addresses the following issues:"
...
* commit '5b7633be4e107888db7b6fc3d50be6aa8eb7f95c':
This patch addresses the following issues:
2012-06-12 08:05:22 -07:00
Jamie Gennis
f3b1395a41
Merge "Add atrace to core.mk" into jb-dev
2012-06-11 12:04:24 -07:00
Jamie Gennis
a9efae347f
Add atrace to core.mk
...
This change adds the atrace binary and init.trace.rc to the system image for
all builds.
Bug: 6513400
Change-Id: Ib979f4b6ffe799ab56e66fc3acfad754d216c576
2012-06-08 14:59:42 -07:00
Eino-Ville Talvala
5b401f8b8b
am e245ecdc
: Merge "Add LegacyCamera to SDK product" into jb-dev
...
* commit 'e245ecdc0a87fb198894995ffbc4e6fec8d812f8':
Add LegacyCamera to SDK product
2012-06-08 09:34:52 -07:00
Eino-Ville Talvala
e245ecdc0a
Merge "Add LegacyCamera to SDK product" into jb-dev
2012-06-08 09:32:27 -07:00
Keun young Park
d3da15a5ee
am 6aae80a8
: Merge "add mini.mk for common configurations for mini products" into jb-dev
...
* commit '6aae80a8d500084466c7e6d90769dda9a5b20507':
add mini.mk for common configurations for mini products
2012-06-06 15:51:24 -07:00
Keun young Park
fd9f8bcfdb
add mini.mk for common configurations for mini products
...
- it is used for generic pdk release
Bug: 6540216
Change-Id: I7dd21724a9484e48c66e4430cd003ffb448f075b
2012-06-06 14:15:57 -07:00
Raghu Gandham
f70dec9281
This patch addresses the following issues:
...
1. Fix a typo.
2. Include libffi in the MIPS list of Product Packages.
3. Default to JSC for MIPS until the MIPS support in v8 lands in aosp.
2012-06-05 15:33:37 -07:00
Eino-Ville Talvala
97150497b3
Add LegacyCamera to SDK product
...
Change-Id: I690bf0ba6435c520c3de1d6fb250ffae1ae45475
2012-06-05 13:53:33 -07:00
Jean-Baptiste Queru
89a0306ec3
am e7af5e24
: Add Live Wallpapers to AOSP builds
...
* commit 'e7af5e2428d6c831acb73fac6547c3a780dca729':
Add Live Wallpapers to AOSP builds
2012-06-02 08:35:03 -07:00
Jean-Baptiste Queru
e7af5e2428
Add Live Wallpapers to AOSP builds
...
Change-Id: I76df14d99fd876b765510ced8f5523e3bafce291
2012-06-01 18:27:03 -07:00
Wink Saville
84690f969e
am f97105ea
: Merge "Fix rild running in Nakasi." into jb-dev
...
* commit 'f97105ea898fd4ad83ca55e391c0d512e3497b9b':
Fix rild running in Nakasi.
2012-05-31 13:25:41 -07:00
Wink Saville
f97105ea89
Merge "Fix rild running in Nakasi." into jb-dev
2012-05-31 13:21:34 -07:00
Wink Saville
689f117b63
Fix rild running in Nakasi.
...
The module rild is telephony specific, since Nakasi has no radio
it shouldn't run rild. Changing the build system so rild is optional
for products that don't have telephony support.
Since rild is now optional, it is necessary to add it explicitly to
the sdk build as the sdk build is special.
Bug: 6463864
Change-Id: If944e051023b567807585fb91163a1e3f79c1024
2012-05-31 10:35:52 -07:00
Keun young Park
53ba6b22f9
am 15d15136
: Merge "change location of apns-conf.xml and vold.conf" into jb-dev
...
* commit '15d151367482b6ed47cecf1a578b365b7c6ccab3':
change location of apns-conf.xml and vold.conf
2012-05-30 20:34:00 -07:00
Keun young Park
e581d866fb
change location of apns-conf.xml and vold.conf
...
- from development/data to device/generic/goldfish/data
Change-Id: Iab7ad32b31b64f854412dd3cf23fd244a5306ed9
2012-05-30 16:32:30 -07:00
Jean-Baptiste Queru
fe5d7c788b
am a2bfde63
: am fed2587c
: Merge "dalvik heapsize: Remove obsolete flag, set porperty"
...
* commit 'a2bfde63b767378979145cb8be55d9a305e2b4f5':
dalvik heapsize: Remove obsolete flag, set porperty
2012-05-25 07:19:55 -07:00
Jean-Baptiste Queru
4261ace013
resolved conflicts for merge of 9f312b81
to jb-dev-plus-aosp
...
Change-Id: I4589e38d0a2d35f84f16e00dd9cffa02b25ebf98
2012-05-25 07:16:04 -07:00
Bruce Beare
5b21303927
dalvik heapsize: Remove obsolete flag, set porperty
...
Change-Id: I51360867171aaebce071b3391678ff6e7f191dc5
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2012-05-24 11:38:18 -07:00
Jean-Baptiste Queru
3deea32a31
Merge "Enable DRM support in the SDK system image"
2012-05-24 10:14:05 -07:00
Jean-Baptiste Queru
e4abb37a73
am 27a4fa10
: am 2d0055dd
: Merge "Revert "Add module \'idmap\'.""
...
* commit '27a4fa10a90c754da307ddda14e16c3864dc0413':
Revert "Add module 'idmap'."
2012-05-23 16:16:30 -07:00
Jean-Baptiste Queru
4412133fb8
Revert "Add module 'idmap'."
...
This reverts commit eb7c4a5e9e
.
2012-05-23 16:03:14 -07:00
Jean-Baptiste Queru
a213c695a0
am 372936d8
: am c47b90a9
: Merge "Add module \'idmap\'."
...
* commit '372936d881a2b64333c88ccb012ec57f80a2e424':
Add module 'idmap'.
2012-05-23 16:01:09 -07:00
Jean-Baptiste Queru
c47b90a9a9
Merge "Add module 'idmap'."
2012-05-23 14:40:00 -07:00
Andrew Hsieh
b968c85edf
Set generic_x86/BoardConfig.mk TARGET_ARCH_VARIANT to x86
...
Change TARGET_ARCH_VARIANT from x86-atom to x86, for the reason
that atom-specific instruciton like "movbe" isn't "generic" to
x86 Android devices and x86 host running emulator-x86, which may
crash non-atom host in VT because "movbe" isn't supported natively.
Also revert previous fix in TARGET_linux-x86.mk which conservatively
disable "movbe" across the board
Change-Id: Ief93a3585566ffae558fcdc29741e6213a048d7d
2012-05-21 14:27:59 +08:00
James Dong
3ffbea3dcf
am 4007faf4
: Remove dependency of libvideoeditor_jni.so on static libs from video editor engine
...
* commit '4007faf4c6bb99883f6ac7a8d80a956837909ff8':
Remove dependency of libvideoeditor_jni.so on static libs from video editor engine
2012-05-16 01:22:31 -07:00
James Dong
4007faf4c6
Remove dependency of libvideoeditor_jni.so on static libs from video editor engine
...
related-to-bug: 6502980
Change-Id: I02a735ff4897ed386fe9c5d886260b1363a1e019
2012-05-16 01:17:42 -07:00
James Dong
4d5c4dc3e0
am c8bfb1ca
: Revert "Remove dependency of libvideoeditor_jni.so on static libs from video editor engine" Fixed the broken build first.
...
* commit 'c8bfb1cad15822f31e3f3250d00b4ef6761c19c4':
Revert "Remove dependency of libvideoeditor_jni.so on static libs from video editor engine" Fixed the broken build first.
2012-05-15 14:59:09 -07:00
James Dong
c8bfb1cad1
Revert "Remove dependency of libvideoeditor_jni.so on static libs from video editor engine"
...
Fixed the broken build first.
This reverts commit e85f05be14
.
2012-05-15 14:47:37 -07:00
James Dong
a0404bf3b7
am e85f05be
: Remove dependency of libvideoeditor_jni.so on static libs from video editor engine
...
* commit 'e85f05be147bf7d916d1b1622f6f3038dac8913b':
Remove dependency of libvideoeditor_jni.so on static libs from video editor engine
2012-05-15 14:27:02 -07:00
James Dong
e85f05be14
Remove dependency of libvideoeditor_jni.so on static libs from video editor engine
...
related-to-bug: 6328360
Change-Id: Ia320d417497bc410f99f8ff7f11c727d1299afba
2012-05-15 00:45:45 -07:00
Jean-Baptiste Queru
44fd5580b5
am 7eb749d1
: am 2d7274de
: Merge "MIPS generic target support"
...
* commit '7eb749d134fd52e23be7218bf2ea7dfa1b1180b3':
MIPS generic target support
2012-05-11 21:53:54 -07:00
Victoria Lease
057366e21d
am 67095e00
: Merge "Parse external/cibu-fonts/fonts.mk." into jb-dev
...
* commit '67095e005c48c639954d4ada60f391ff4923f0eb':
Parse external/cibu-fonts/fonts.mk.
2012-05-11 16:54:00 -07:00
Victoria Lease
67095e005c
Merge "Parse external/cibu-fonts/fonts.mk." into jb-dev
2012-05-11 16:51:47 -07:00
Jean-Baptiste Queru
2d7274de30
Merge "MIPS generic target support"
2012-05-11 14:46:38 -07:00
Jean-Baptiste Queru
8ff07372c1
am 0e2bc24e
: am cd99ece7
: Merge "x86: customize the malloced address to be 16-byte aligned"
...
* commit '0e2bc24ef002ec612e94a64da297a7698acde749':
x86: customize the malloced address to be 16-byte aligned
2012-05-11 14:12:10 -07:00
Jean-Michel Trivi
a5cb884640
am 0c5db81f
: Merge "Add OMX IL FLAC encoder library" into jb-dev
...
* commit '0c5db81fb28f74491e7f17c6c81ae0b19342ca7c':
Add OMX IL FLAC encoder library
2012-05-10 10:45:15 -07:00
Jean-Michel Trivi
0c5db81fb2
Merge "Add OMX IL FLAC encoder library" into jb-dev
2012-05-10 09:54:41 -07:00
Jean-Michel Trivi
b8bc852d5d
Add OMX IL FLAC encoder library
...
Bug 5525503
Add the software FLAC encoder OMX IL wrapper to the build.
Change-Id: Iac69558088934e0db41e9cc7fa3fab7e72348568
2012-05-09 16:00:11 -07:00
Jeff Brown
9c55335afd
am 8c1028d4
: Merge "Add keyboard layout package to build." into jb-dev
...
* commit '8c1028d45cfd7892a031e32b4e51bad729ebd2cb':
Add keyboard layout package to build.
2012-05-09 01:45:55 -07:00
Jean-Michel Trivi
8fda511103
am 0acb2064
: Merge "Make audio downmixer part of the core platform" into jb-dev
...
* commit '0acb2064d7080ab1b3d993cfad66fbf852f9663a':
Make audio downmixer part of the core platform
2012-05-09 01:45:21 -07:00
Raghu Gandham
b53cc7a82b
MIPS generic target support
...
Change-Id: I76506eba9d11867e53069c97038996bddd7dd5a2
Signed-off-by: Chris Dearman <chris@mips.com>
Signed-off-by: Raghu Gandham <raghu@mips.com>
Signed-off-by: Duane Sand <duanes@mips.com>
Signed-off-by: Bhanu Chetlapalli <bhanu@mips.com>
2012-05-08 11:53:47 -07:00
Victoria Lease
c5fc79071a
Parse external/cibu-fonts/fonts.mk.
...
Bug: 6232193
Change-Id: I5a4b1077440ce9ab5bc504d5b2fca1a9648cc084
2012-05-08 09:28:34 -07:00
Jack Ren
6f28d9750c
x86: customize the malloced address to be 16-byte aligned
...
That can gain better memory performance than 8-byte alignment
Change-Id: Ibcc5bf7b96ed10166038357dd0c86c9171768f3e
Signed-off-by: Jack Ren <jack.ren@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2012-05-08 13:38:25 +08:00
Jeff Brown
8c1028d45c
Merge "Add keyboard layout package to build." into jb-dev
2012-05-07 19:30:00 -07:00
Jeff Brown
b2d926898c
Add keyboard layout package to build.
...
Bug: 6110399
Change-Id: Ifb1d0126359750699244e481b49bbaf49371b7ae
2012-05-07 19:11:06 -07:00
Jean-Michel Trivi
d3763c4214
Make audio downmixer part of the core platform
...
Add the multichannel audio downmix effect to the core platform, as
it is now a core feature of the media framework.
Bug 6456547
Change-Id: I35f88f6bffc131d5fe837c3767879f2536cec05b
2012-05-07 17:10:12 -07:00
Elliott Hughes
559ffeb2ef
am 8e67348b
: Merge "Track libnativehelper move for PDK." into jb-dev
...
* commit '8e67348b515636ec8314da44b3f583c5d053e81a':
Track libnativehelper move for PDK.
2012-05-04 16:50:41 -07:00
Elliott Hughes
8e67348b51
Merge "Track libnativehelper move for PDK." into jb-dev
2012-05-04 16:48:37 -07:00
Vikram Aggarwal
107339d84d
am aa6ffd75
: Merge "Fix the build. Exchange -> Exchange2" into jb-dev
...
* commit 'aa6ffd7595966808a60341a449745d3d03d88768':
Fix the build. Exchange -> Exchange2
2012-05-04 16:42:05 -07:00
Vikram Aggarwal
e396df8cb5
Fix the build. Exchange -> Exchange2
...
Change-Id: I70b479b69ea60a60ee3725344aa410c6e4f9d6b7
2012-05-04 16:34:27 -07:00
Elliott Hughes
89898dff4e
Track libnativehelper move for PDK.
...
Bug: 6369821
Change-Id: I4dfd9eece9f6912a37c3caee77bd0eadb9313160
2012-05-04 15:36:42 -07:00
Jun Tian
020e159f2d
Enable DRM support in the SDK system image
...
Move the DRM packages from full_base.mk to core.mk to support DRM both on full and SDK building.
It can fix the DRM CTS failures in the system image for emulator.
Change-Id: Id12b0ca83a815aac90860230582882e370693522
2012-05-04 10:36:03 +08:00
Jean-Baptiste Queru
5af27de0b5
resolved conflicts for merge of 343597c3
to jb-dev-plus-aosp
...
Change-Id: I84648a8044e6238a57b4a08a261146bfa3c8c1c7
2012-05-02 15:24:32 -07:00