Commit graph

179 commits

Author SHA1 Message Date
Lajos Molnar
f40956fbbf stagefright: use media_codecs_google*.xml files
Bug: 13549114
Change-Id: I25d6344c78da152f394fa7b4855a2eb61008afc6
2014-03-19 17:39:39 -07:00
Victoria Lease
c9b7f3d6a1 am 3c14d21a: am 14a5be01: am 4e965ac6: am 38626e63: Merge "Add external/google-fonts/*/fonts.mk."
* commit '3c14d21a2a62398322479e015fecdb43652fb331':
  Add external/google-fonts/*/fonts.mk.
2014-03-03 23:49:36 +00:00
Victoria Lease
14a5be0174 am 4e965ac6: am 38626e63: Merge "Add external/google-fonts/*/fonts.mk."
* commit '4e965ac6f56de2071a381ed37e4a9899062e5ab2':
  Add external/google-fonts/*/fonts.mk.
2014-03-03 23:42:48 +00:00
Victoria Lease
8da3a02c1f Add external/google-fonts/*/fonts.mk.
Bug: 12384866
Change-Id: I30abb9fb962a59b46be1cb9f12b099ea29850a50
2014-02-28 15:35:07 -08:00
Steve Moyer
6bbb6a1fe3 Combine emulator test projects into a single apk
SmsTest, GpsLocationTest, ConnectivityTest -> EmulatorSmokeTests

Change-Id: I39e02fbe2cf9761607dfb4c2f0d6c4906e8b1e51
2014-02-19 10:39:20 -08:00
Steve Moyer
60250d42a1 Merge "Adding SmsTest to sdk build" 2014-02-11 00:42:16 +00:00
David 'Digit' Turner
35cfe9e8af am cc57457c: am 145562fc: Merge "Add missing font files to SDK system images."
* commit 'cc57457c880fdf5e85dd07b11fa61928ca692b45':
  Add missing font files to SDK system images.
2014-02-10 13:29:51 +00:00
David 'Digit' Turner
cc57457c88 am 145562fc: Merge "Add missing font files to SDK system images."
* commit '145562fcef979e4fea946987717618dba6148aeb':
  Add missing font files to SDK system images.
2014-02-10 12:10:22 +00:00
Steve Moyer
577e914b03 Adding SmsTest to sdk build
Change-Id: I42cf752e188ce579ecb9e9c6439d369bdbb0c177
2014-02-07 11:46:08 -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
Xavier Ducrohet
c1bb0c774a resolved conflicts for merge of 9c7281fb to master
Change-Id: Ibbcb5cdc46d6d7e1a5bf12d090717f11b26b7308
2013-12-04 18:41:24 -08:00
Xavier Ducrohet
7a33b56429 am 8eb89dde: am ab92f3df: Add Dialer to SDK system image. DO NOT MERGE.
* commit '8eb89dde9b1c4da0aa0d116ef05e12c38873b756':
  Add Dialer to SDK system image. DO NOT MERGE.
2013-12-04 13:33:41 -08:00
Xavier Ducrohet
ab92f3dff0 Add Dialer to SDK system image. DO NOT MERGE.
Change-Id: I4f15482385c869a4ae08d99ae98bffc7c113acd7
2013-12-04 13:25:56 -08:00
Ying Wang
2cebe0baed Clean up the common base core.mk of the sdk and the aosp_* products.
Any modules common to sdk and aosp_* builds should go to core.mk.

Bug: 11773036
Change-Id: I342133c94eb24be3e69a553be0069e2269624d3e
2013-11-20 15:23:52 -08:00
Ying Wang
4356b55635 Remove the unused product variable PRODUCT_POLICY
Change-Id: Idf17d36e9278ed3ed701e0231205525a87b97c41
2013-11-20 10:58:00 -08: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
Ying Wang
d482f4a524 am ac2cb396: am 929b3a24: Merge "Adding the missing audio files into the SDK system image"
* commit 'ac2cb3965076c30698190769eb6606fde111748b':
  Adding the missing audio files into the SDK system image
2013-08-21 12:46:09 -07:00
Jun Tian
763217f1d5 Adding the missing audio files into the SDK system image
The system audio files are not included in the SDK image makefile.
It causes the audio effects cannot be played in the SDK image.
It also fixed lots of error messages in the logcat.

Change-Id: I1670b2b9e4f8fe6709cd68b8e792e2f8c289876f
2013-08-06 10:27:48 +08:00
Svetoslav Ganov
0402a4b12c Print - build
Change-Id: I640adcc41697e609ed324bd1f1dd032e20df4933
2013-06-21 17:33:18 -07:00
Mike Lockwood
b14ac715e2 Remove references to DrmProvider
Change-Id: If05d95c3c8ccf5b0455046fee113221437db2710
2013-04-29 17:21:16 -07:00
Ben Murdoch
772a4f6099 am 3e572762: am 0646fdae: Fix SDK build.
* commit '3e5727623a19c1daed4be62cb2a31c7c29eb5ff6':
  Fix SDK build.
2013-04-02 11:04:34 -07:00
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
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
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
d6e63b3ab5 remove reference of emulator vold.fstab which is no longer necessary
Change-Id: I2c8d28060e8204ecbe255cb1e2752e3030dc2d99
2013-03-05 17:44:10 -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
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
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
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
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
Xavier Ducrohet
1818ea8ae0 Add dev settings to emulator.
Change-Id: I0f92257c0a6ac92f3bce4ad004c3e2414ef0f9da
2012-11-06 17:03:52 -08: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
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
Paul Westbrook
6392aeeadb Remove imap2 from build
Change-Id: I64b5db47895e99f76d30e453f4d95c9546a96839
2012-08-22 14:49:58 -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
Paul Westbrook
95781f03c9 Add imap2 to the build
Change-Id: I9750d69b64560ad0c3285f5cebdbfe5087289f99
2012-08-03 11:47:53 -07:00
Marc Blank
f173c6be57 Change build targets to use Email2/Exchange2
Change-Id: I1b93b112b4d31ce379d33e2d1202fc90bb8d21eb
2012-06-28 16:55:57 -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
97150497b3 Add LegacyCamera to SDK product
Change-Id: I690bf0ba6435c520c3de1d6fb250ffae1ae45475
2012-06-05 13:53:33 -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