Commit graph

867 commits

Author SHA1 Message Date
gcondra@google.com
8f8e35d7dd am 809b537e: am 046ed25f: Merge "Add the sepolicy.version file to the root directory." into jb-mr2-dev
* commit '809b537e4a9fa7007bb455a630f999514f0f0cee':
  Add the sepolicy.version file to the root directory.
2013-05-15 13:37:24 -07:00
gcondra@google.com
809b537e4a am 046ed25f: Merge "Add the sepolicy.version file to the root directory." into jb-mr2-dev
* commit '046ed25f5212a3778868c28ad6695fb6f8ce26d2':
  Add the sepolicy.version file to the root directory.
2013-05-15 13:34:48 -07:00
repo sync
83f646a0ef Add the sepolicy.version file to the root directory.
Bug: 8841348
Change-Id: I9b4b096eb11b332a4c2c3cb8df179cf611a7ff43
2013-05-13 13:21:23 -07:00
Kenny Root
47c185d724 am dfaf3843: Track change to JSSE provider
* commit 'dfaf384309d523a30bedcb9fe6da1074bafbe990':
  Track change to JSSE provider
2013-04-30 09:01:43 -07:00
Mike Lockwood
b14ac715e2 Remove references to DrmProvider
Change-Id: If05d95c3c8ccf5b0455046fee113221437db2710
2013-04-29 17:21:16 -07:00
Mike Lockwood
fe1a83cbc0 Remove obsolete OMA-DRM support
Change-Id: Ie460730f3ec42e2208e4df685250f7b95a77b4c7
2013-04-29 16:11:00 -07:00
Kenny Root
dfaf384309 Track change to JSSE provider
Change-Id: I130b137f8ba62a3cf1b915dcf6a0cf3dc25043eb
2013-04-29 15:58:54 -07:00
Matthew Xie
f012cfe792 am e78c0b8c: am b1f10133: Remove DBUS from make files
* commit 'e78c0b8c359910815171ee61952ddeff834699f1':
  Remove DBUS from make files
2013-04-24 14:24:30 -07:00
Matthew Xie
e78c0b8c35 am b1f10133: Remove DBUS from make files
* commit 'b1f1013321e1f64fd43a3e9fa008ac38845b773f':
  Remove DBUS from make files
2013-04-24 14:21:52 -07:00
Matthew Xie
b1f1013321 Remove DBUS from make files
DBUS had been needed by bluetooth bluz stack. It is not needed after
we replaced bluez stack with bluedroid stack.
bug 6872904

Change-Id: I952624e61c1e570c7e8d5a23937ab93a173d135c
2013-04-23 14:01:23 -07:00
Jeff Sharkey
f416da9802 am 021aa4ce: Merge "DO NOT MERGE. Fix build by removing old file." into jb-mr2-dev
* commit '021aa4cefe03fd7cca5ee4baf25a562c6f6cda20':
  DO NOT MERGE. Fix build by removing old file.
2013-04-11 17:14:48 -07:00
Jeff Sharkey
90baef427e DO NOT MERGE. Fix build by removing old file.
Change-Id: I2fb4d27acfabb9283d54958f0438a6db74641dd2
2013-04-11 17:09:56 -07:00
Jeff Sharkey
702ed1bf18 Fix build by removing old file.
Change-Id: I2fb4d27acfabb9283d54958f0438a6db74641dd2
2013-04-11 15:38:12 -07:00
Dianne Hackborn
11f953f957 am aad80a82: am 51ebc822: Merge "Add new media command to build." into jb-mr2-dev
* commit 'aad80a822604db0d751e1bcc3e6ad09fe783e199':
  Add new media command to build.
2013-04-08 17:05:32 -07:00
Dianne Hackborn
aad80a8226 am 51ebc822: Merge "Add new media command to build." into jb-mr2-dev
* commit '51ebc822c1cf7cc206d5a6acc98b8a3f06227426':
  Add new media command to build.
2013-04-08 15:37:39 -07:00
Dianne Hackborn
4acd27dfb3 Add new media command to build.
Change-Id: I3c32924b0c6400aa22221646f8e118a66f65f628
2013-04-05 17:05:06 -07:00
Brian Carlstrom
1bcbf3593d am 71267677: resolved conflicts for merge of 5ec66d15 to jb-mr2-dev-plus-aosp
* commit '712676772b0d6e32bdce3430eed0a4d9771aac7e':
  Add OkHttp to the platform.
2013-04-03 15:03:48 -07:00
Brian Carlstrom
712676772b resolved conflicts for merge of 5ec66d15 to jb-mr2-dev-plus-aosp
Change-Id: I0ef1665600f78527d0a98c7b36c4c2ef1a8182e3
2013-04-03 14:19:26 -07:00
jwilson
190dde0b1a Add OkHttp to the platform.
Change-Id: I18716683632249573295cb2eb5229a1188ed0f17
2013-04-02 16:24:04 -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
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