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
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
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
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
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
91afae6c03
resolved conflicts for merge of dd14acc3
to jb-mr1-dev
...
Change-Id: Ic900c623a7c7fd20c965b8d838caf0f01ceab53f
2012-08-10 12:42:18 -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
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
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
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
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
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
4261ace013
resolved conflicts for merge of 9f312b81
to jb-dev-plus-aosp
...
Change-Id: I4589e38d0a2d35f84f16e00dd9cffa02b25ebf98
2012-05-25 07:16:04 -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
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-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
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
Jean-Baptiste Queru
6ed1beed3d
am a4354dd8
: am 2ba46ecd
: Merge "Add Esperanto to the list of locales"
...
* commit 'a4354dd8ce98320a1e6ca895dc049b82c8e1fa46':
Add Esperanto to the list of locales
2012-05-02 14:18:27 -07:00
Jun Tian
07fe2cf7b4
Enable sound effect support in the SDK system image
...
Add the missing configuration in sdk.mk to support sound effect in the SDK building.
This patch can fix the CTS sound effect failues of media test in emulator system image.
Change-Id: I8c22e62201d48c2e56fb4c105795bb96ded8f34d
2012-05-02 12:18:52 -07:00
Jean-Baptiste Queru
2ba46ecdc4
Merge "Add Esperanto to the list of locales"
2012-05-02 07:39:16 -07:00
James Dong
a69e6194da
Build libstagefright_soft_mpeg4enc.so by default
...
o related-to-bug: 6401068
Change-Id: I3114d4b817acc85a6982d03ef3b161141413a079
2012-04-25 18:10:19 -07:00
James Dong
a56be342c2
Merge "Build libstagefright_soft_h264enc by default"
2012-04-24 18:02:49 -07:00
Ying Wang
64f642d688
Fix pdk build.
...
The pdk builds don't have access to development.
Change-Id: Ie7e9f8d24b788749481465311e64145e175b8c4f
2012-04-24 17:12:43 -07:00
Raphael Moll
b7567ea321
resolved conflicts for merge of 4a6e8b95
to master
...
Change-Id: I04abdad12266d7f0eb248528d9bbd35369d18413
2012-04-24 15:43:28 -07:00
James Dong
d5177950a5
Build libstagefright_soft_h264enc by default
...
related-to-bug: 6383440
Change-Id: I852941c72f9b7270ac6e5b094e4b2a0322643ac8
2012-04-24 14:02:25 -07:00
Raphael Moll
f66f3476e4
Split target/product/sdk.mk into sdk.git
...
This changes target/product/sdk.mk so that the list of tools
and libs to build for the SDK be actually defined in both
sdk.git and development.git.
Depends on dev.git change I6bbc6644a and sdk.git change Id270eba6
Change-Id: I790df85ea8620f73c769aec0f92f474de60b63f9
2012-04-20 14:14:55 -07:00
Brett Chabot
a8df794649
Merge "Add smoke tests to sdk build."
2012-04-18 14:56:18 -07:00
Mike Lockwood
8945c2609e
Merge "core.mk: Add rule for init.usb.rc"
2012-04-17 10:40:04 -07:00
Brett Chabot
1e420b6063
Add smoke tests to sdk build.
...
Change-Id: If614ad21b3323e16b358f248c44c15b0fe5f0e9a
2012-04-16 18:29:48 -07:00
Andrew Flynn
3bdcae333f
Merge "Default ro.carrier to unknown"
2012-04-16 10:25:27 -07:00
Andrew Flynn
dc790b0f1d
Default ro.carrier to unknown
...
This was previously performed by init.c
Change-Id: Id34c636e06dfe2766446f909e9d05557163d812d
2012-04-16 10:16:02 -07:00