David 'Digit' Turner
145562fcef
Merge "Add missing font files to SDK system images."
2014-02-10 11:31:18 +00:00
Steve Moyer
577e914b03
Adding SmsTest to sdk build
...
Change-Id: I42cf752e188ce579ecb9e9c6439d369bdbb0c177
2014-02-07 11:46:08 -08:00
Elliott Hughes
77f88ce0da
am 3f040869
: am efb9603a
: Merge "[MIPS64] Add mips64 target"
...
* commit '3f0408695b23a8d21c3227ae845006381b26f666':
[MIPS64] Add mips64 target
2014-02-06 20:29:48 +00:00
Elliott Hughes
3f0408695b
am efb9603a
: Merge "[MIPS64] Add mips64 target"
...
* commit 'efb9603aeb5ac71e23fa2a3ade6aa4fc2efdeb5e':
[MIPS64] Add mips64 target
2014-02-06 20:21:41 +00:00
Andreas Huber
a42d3a4865
fix the build, libstagefright_chromium_http is no longer needed.
...
Change-Id: I1777b3e9157a4bdb868b9e14cc62422b1e017c5d
2014-02-06 09:29:48 -08:00
Chris Dearman
1efd9e462a
[MIPS64] Add mips64 target
...
Change-Id: Ice1621101c0d5a3314db288542ca8020e3f406bf
Signed-off-by: Duane Sand <duane.sand@imgtec.com>
2014-02-05 19:07:57 -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
Noreen Tolland
4b69be271c
am c816e061
: Merge "(DO NOT MERGE) Revert "Make libart the default runtime"" into klp-modular-dev
...
* commit 'c816e061270327d3e2b73ae3c848e1fefc6ec6ef':
(DO NOT MERGE) Revert "Make libart the default runtime"
2014-01-31 23:17:33 +00:00
Noreen Tolland
c816e06127
Merge "(DO NOT MERGE) Revert "Make libart the default runtime"" into klp-modular-dev
2014-01-31 23:13:24 +00:00
Nick Vaccaro
2422e76192
am ec0c99a6
: Add atrace for supporting systrace tool
...
* commit 'ec0c99a6c574954fb37bd94ba18b02a20edbe122':
Add atrace for supporting systrace tool
2014-01-31 16:41:07 +00:00
Mårten Kongstad
2e1ade925c
Runtime resource overlay, iteration 2
...
Support any number of overlay packages. Support any target package.
UPDATED PACKAGE MATCHING
------------------------
In Runtime resource overlay, iteration 1, only a single overlay package
was considered. Package matching was based on file paths:
/vendor/overlay/system/framework-res.apk corresponded to
/system/framework-res.apk. Introduce a more flexible matching scheme
where any package is an overlay package if its manifest includes
<overlay targetPackage="com.target.package"/>
For security reasons, an overlay package must fulfill certain criteria
to take effect: see below.
THE IDMAP TOOL AND IDMAP FILES
------------------------------
Idmap files are created by the 'idmap' binary; idmap files must be
present when loading packages. For the Android system, Zygote calls
'idmap' as part of the resource pre-loading. For application packages,
'idmap' is invoked via 'installd' during package installation (similar
to 'dexopt').
UPDATED FLOW
------------
The following is an outline of the start-up sequences for the Android
system and Android apps. Steps marked with '+' are introduced by this
commit.
Zygote initialization
Initial AssetManager object created
+ idmap --scan creates idmaps for overlays targeting 'android', \
stores list of overlays in /data/resource-cache/overlays.list
AssetManager caches framework-res.apk
+ AssetManager caches overlay packages listed in overlays.list
Android boot
New AssetManager's ResTable acquired
AssetManager re-uses cached framework-res.apk
+ AssetManager re-uses cached 'android' overlays (if any)
App boot
ActivityThread prepares AssetManager to load app.apk
+ ActivityThread prepares AssetManager to load app overlays (if any)
New AssetManager's ResTable acquired as per Android boot
SECURITY
--------
Overlay packages are required to be pre-loaded (in /vendor/overlay).
These packages are trusted by definition. A future iteration of runtime
resource overlay may add support for downloaded overlays, which would
likely require target and overlay signatures match for the overlay to
be trusted.
LOOKUP PRIORITY
---------------
During resource lookup, packages are sequentially queried to provide a
best match, given the constraints of the current configuration. If any
package provide a better match than what has been found so far, it
replaces the previous match. The target package is always queried last.
When loading a package with more than one overlay, the order in which
the overlays are added become significant if several packages overlay
the same resource.
Had downloaded overlays been supported, the install time could have been
used to determine the load order. Regardless, for pre-installed
overlays, the install time is randomly determined by the order in which
the Package Manager locates the packages during initial boot. To support
a well-defined order, pre-installed overlay packages are expected to
define an additional 'priority' attribute in their <overlay> tags:
<overlay targetPackage="com.target.package" priority="1234"/>
Pre-installed overlays are loaded in order of their priority attributes,
sorted in ascending order.
Assigning the same priority to several overlays targeting the same base
package leads to undefined behaviour. It is the responsibility of the
vendor to avoid this.
The following example shows the ResTable and PackageGroups after loading
an application and two overlays. The resource lookup framework will
query the packages in the order C, B, A.
+------+------+- -+------+------+
| 0x01 | | ... | | 0x7f |
+------+------+- -+------+------+
| |
"android" Target package A
|
Pre-installed overlay B (priority 1)
|
Pre-installed overlay C (priority 2)
Change-Id: If49c963149369b1957f7d2303b3dd27f669ed24e
2014-01-31 14:44:07 +01:00
Brian Carlstrom
d4e29f528a
am cece05e2
: Merge "Bump generic_mips BOARD_SYSTEMIMAGE_PARTITION_SIZE for PRODUCT_RUNTIME := libart_runtime_default"
...
* commit 'cece05e273dc1c9d4ea140b294df72005ac8ac53':
Bump generic_mips BOARD_SYSTEMIMAGE_PARTITION_SIZE for PRODUCT_RUNTIME := libart_runtime_default
2014-01-31 10:26:48 +00:00
Nick Vaccaro
572041e6d0
am ec0c99a6
: Add atrace for supporting systrace tool
...
* commit 'ec0c99a6c574954fb37bd94ba18b02a20edbe122':
Add atrace for supporting systrace tool
2014-01-30 18:42:15 -08:00
Justin Mattson
b60a3f97d1
(DO NOT MERGE) Revert "Make libart the default runtime"
...
This reverts commit 08d410f532
.
2014-01-30 15:30:08 -08:00
Nick Vaccaro
ec0c99a6c5
Add atrace for supporting systrace tool
...
Change-Id: I6504a447218a70b0d148c0b5802228fb28934a0a
Signed-off-by: Nick Vaccaro <nvaccaro@google.com>
2014-01-30 20:33:46 +00:00
Brian Carlstrom
4d662a63a4
Bump generic_mips BOARD_SYSTEMIMAGE_PARTITION_SIZE for PRODUCT_RUNTIME := libart_runtime_default
...
(cherry picked from commit c8501bffcb
)
Change-Id: I12ce7c4e383e74e54d77b54a0406d2499699edbf
2014-01-28 23:43:40 -08:00
Brian Carlstrom
c8501bffcb
Bump generic_mips BOARD_SYSTEMIMAGE_PARTITION_SIZE for PRODUCT_RUNTIME := libart_runtime_default
...
Change-Id: I38d9cb749ec892ba0ba423b0d7c727b27b40b3db
2014-01-28 23:34:15 -08:00
Brian Carlstrom
03e1caed18
Make libart the default runtime
...
(cherry picked from commit 08d410f532
)
Change-Id: I4e78a03fcd92e52f34be30726e40af287bb67309
2014-01-28 17:41:40 -08:00
Brian Carlstrom
0b0d6277e0
am be7575ec
: am cba215dd
: am d21197d5
: Merge "Make libart the default runtime"
...
* commit 'be7575ecb1827784f83582847749aa59c664d29e':
Make libart the default runtime
2014-01-29 00:44:02 +00:00
Brian Carlstrom
be7575ecb1
am cba215dd
: am d21197d5
: Merge "Make libart the default runtime"
...
* commit 'cba215dd3241ae62416800f8d97d114d8a6e1a9a':
Make libart the default runtime
2014-01-29 00:41:31 +00:00
Brian Carlstrom
cba215dd32
am d21197d5
: Merge "Make libart the default runtime"
...
* commit 'd21197d50caaa025bd823a004984a2820bb3c2e2':
Make libart the default runtime
2014-01-29 00:39:45 +00:00
Brian Carlstrom
08d410f532
Make libart the default runtime
...
Change-Id: I4394f2bdef6f1be36f0f17f3b42d3e62bc2245ef
2014-01-28 09:52:15 -08:00
Elliott Hughes
d63d974c49
am 6fe9a949
: am 69c36ee7
: am 4fbf23ef
: am 0a3cf1a0
: Merge "Remove libthread_db from the default include path."
...
* commit '6fe9a94989879babb859a24fdef0b2553955cc53':
Remove libthread_db from the default include path.
2014-01-28 01:04:55 +00:00
Elliott Hughes
6fe9a94989
am 69c36ee7
: am 4fbf23ef
: am 0a3cf1a0
: Merge "Remove libthread_db from the default include path."
...
* commit '69c36ee7a8c1e3d8c7ca04d61f75d95585c58253':
Remove libthread_db from the default include path.
2014-01-28 00:59:15 +00:00
Elliott Hughes
69c36ee7a8
am 4fbf23ef
: am 0a3cf1a0
: Merge "Remove libthread_db from the default include path."
...
* commit '4fbf23ef8267849ce88217a256b394de3904a4f6':
Remove libthread_db from the default include path.
2014-01-28 00:54:33 +00:00
Elliott Hughes
4fbf23ef82
am 0a3cf1a0
: Merge "Remove libthread_db from the default include path."
...
* commit '0a3cf1a0e5c6dbe132c1dc5e13293960c5e7b103':
Remove libthread_db from the default include path.
2014-01-28 00:43:29 +00:00
Elliott Hughes
2f8dcdd961
Remove libthread_db from the default include path.
...
This should never have been on the default include path.
The NDK statically links its own libthread_db, so I'm removing
bionic's unused copy from devices.
Bug: 11882807
Change-Id: I49a67fe0902cc4bc178360f6c993959774d74e3a
2014-01-27 15:45:17 -08:00
Colin Cross
194c2a39be
am de89397b
: am 5119fcfc
: am f81cc531
: am d5227a83
: Merge "build: rename aarch64 target to arm64"
...
* commit 'de89397b1636b9d77cbcdea1cfb347251e1d5b0c':
build: rename aarch64 target to arm64
2014-01-24 21:24:54 +00:00
Colin Cross
de89397b16
am 5119fcfc
: am f81cc531
: am d5227a83
: Merge "build: rename aarch64 target to arm64"
...
* commit '5119fcfc2052e9f3a5d4415759fb5bf252d651e8':
build: rename aarch64 target to arm64
2014-01-24 20:48:20 +00:00
Colin Cross
5119fcfc20
am f81cc531
: am d5227a83
: Merge "build: rename aarch64 target to arm64"
...
* commit 'f81cc531b41617b91ef2c46b7f2fb1bf1abb8dc7':
build: rename aarch64 target to arm64
2014-01-24 20:45:41 +00:00
Colin Cross
f81cc531b4
am d5227a83
: Merge "build: rename aarch64 target to arm64"
...
* commit 'd5227a833cde624532ec34e8b25c29af001e427f':
build: rename aarch64 target to arm64
2014-01-24 12:42:35 -08:00
Colin Cross
4f0eb7d50c
build: rename aarch64 target to arm64
...
Rename aarch64 build targets to arm64. The gcc toolchain is still
aarch64.
Change-Id: Ia92d8a50824e5329cf00fd6f4f92eae112b7f3a3
2014-01-23 22:39:38 -08:00
David Turner
28e2108d9a
am 82064659
: am 327c3fef
: am fa2c68e8
: am 51c47855
: Merge "Vibra: compile and stage vibrator.default on all targets"
...
* commit '82064659b8c56ad72f722d96733fe0b6f9ea0002':
Vibra: compile and stage vibrator.default on all targets
2014-01-24 05:51:22 +00:00
David Turner
af5b48d36a
am 2ae1c269
: am 146cce0e
: am cdecaca3
: am dfc140cd
: Merge "Vibra: emulator: compile and stage vibrator.goldfish"
...
* commit '2ae1c269a7984c72932e1797faad58587967ecdf':
Vibra: emulator: compile and stage vibrator.goldfish
2014-01-24 05:51:21 +00:00
David Turner
82064659b8
am 327c3fef
: am fa2c68e8
: am 51c47855
: Merge "Vibra: compile and stage vibrator.default on all targets"
...
* commit '327c3fef766052c4e8d492d2102a39deb3bdcaa4':
Vibra: compile and stage vibrator.default on all targets
2014-01-24 05:47:17 +00:00
David Turner
2ae1c269a7
am 146cce0e
: am cdecaca3
: am dfc140cd
: Merge "Vibra: emulator: compile and stage vibrator.goldfish"
...
* commit '146cce0ebccd5381dad9394dad350f968652c23a':
Vibra: emulator: compile and stage vibrator.goldfish
2014-01-24 05:47:17 +00:00
David Turner
327c3fef76
am fa2c68e8
: am 51c47855
: Merge "Vibra: compile and stage vibrator.default on all targets"
...
* commit 'fa2c68e81a356556298f7bab21a29c14f99f3051':
Vibra: compile and stage vibrator.default on all targets
2014-01-24 05:44:04 +00:00
David Turner
146cce0ebc
am cdecaca3
: am dfc140cd
: Merge "Vibra: emulator: compile and stage vibrator.goldfish"
...
* commit 'cdecaca3017e902002627e68d40d09f00224baf8':
Vibra: emulator: compile and stage vibrator.goldfish
2014-01-24 05:44:03 +00:00
David Turner
fa2c68e81a
am 51c47855
: Merge "Vibra: compile and stage vibrator.default on all targets"
...
* commit '51c47855f01223b88e1eb134504782695867301f':
Vibra: compile and stage vibrator.default on all targets
2014-01-23 21:36:34 -08:00
David Turner
cdecaca301
am dfc140cd
: Merge "Vibra: emulator: compile and stage vibrator.goldfish"
...
* commit 'dfc140cd3f31b4f02c807cc1aa6e85d8db87a324':
Vibra: emulator: compile and stage vibrator.goldfish
2014-01-23 21:36:33 -08:00
David Turner
51c47855f0
Merge "Vibra: compile and stage vibrator.default on all targets"
2014-01-24 05:33:09 +00:00
David Turner
dfc140cd3f
Merge "Vibra: emulator: compile and stage vibrator.goldfish"
2014-01-24 05:32:54 +00:00
Nick Kralevich
690b10e662
build: add logd
...
Original-Change-Id: I1b96d7e6dd823a83b07b312bf07792482e883789
Signed-off-by: Nick Kralevich <nnk@google.com>
* merge conflicts
* rename syslog to logd to avert confusion with bionic syslog
Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Change-Id: I137fb639a80dd28d2f0042b3ae9b7d6eb5eb5bc4
2014-01-23 11:09:52 -08:00
Doug Zongker
00aba87b7b
add the uncrypt binary to device builds
...
The uncrypt binary needs to be present on any device which reboots
into recovery.
Change-Id: I684a279484876e8a596829e41218095a793ea26b
2014-01-16 12:45:21 -08:00
David Wagner
4e0ee6c74a
Vibra: compile and stage vibrator.default on all targets
...
Add the vibrator.default package to all targets deriving from
generic_no_telephony, i.e. virtually all targets.
This change is related to other changes in:
- hardware/libhardware
- hardware/libhardware_legacy
- frameworks/base
- device/generic/goldfish
Change-Id: Ic8464844e12f7d31ca49597dfc4995b13e9ff419
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Signed-off-by: David Wagner <david.wagner@intel.com>
Author-tracking-BZ: 94611
2014-01-10 13:56:20 +01:00
Vinit Deshapnde
af5ad49846
Move Wifi services to a new git project
...
Bug: 12175455
Change-Id: I1fa07e29c6a9aae38d9e334d519a9f2445d15613
2014-01-08 10:43:31 -08:00
Narayan Kamath
fa36195096
am f57caaa3
: am fa0e1626
: am 6ab8c86b
: am 8530e25f
: Merge "Remove libSR_AudioIn from base.mk"
...
* commit 'f57caaa32e473010c30ae97326c632e08791d6d1':
Remove libSR_AudioIn from base.mk
2014-01-08 10:12:12 +00:00
Narayan Kamath
f57caaa32e
am fa0e1626
: am 6ab8c86b
: am 8530e25f
: Merge "Remove libSR_AudioIn from base.mk"
...
* commit 'fa0e1626bdd0964f6f9665c41df66ef27ef32caf':
Remove libSR_AudioIn from base.mk
2014-01-08 10:10:02 +00:00
Narayan Kamath
fa0e1626bd
am 6ab8c86b
: am 8530e25f
: Merge "Remove libSR_AudioIn from base.mk"
...
* commit '6ab8c86b56a5914f30f95b73ab906de3295da03e':
Remove libSR_AudioIn from base.mk
2014-01-08 10:07:49 +00:00
Narayan Kamath
6ab8c86b56
am 8530e25f
: Merge "Remove libSR_AudioIn from base.mk"
...
* commit '8530e25ff666987c7c968c2a323a8b1e7867bcca':
Remove libSR_AudioIn from base.mk
2014-01-08 02:05:12 -08:00
Narayan Kamath
8530e25ff6
Merge "Remove libSR_AudioIn from base.mk"
2014-01-08 09:59:56 +00:00
Ying Wang
cd6ad402a4
am c7471757
: Now PRODUCT_BOOT_JARS is a list of jar names.
...
* commit 'c74717574fab08700f657a3f5ebf8934cf4572c7':
Now PRODUCT_BOOT_JARS is a list of jar names.
2014-01-08 01:26:04 +00:00
Ying Wang
c74717574f
Now PRODUCT_BOOT_JARS is a list of jar names.
...
See commit ad6674cd60
.
Change-Id: I5e45c400644b6b98dcf64d96eb2425cdbafb3021
2014-01-07 17:22:10 -08:00
Ying Wang
a21b8ea724
am a292b7b0
: am 83709a21
: am 95fc1a50
: am f12d4810
: Merge "PRODUCT_BOOT_JARS as a list of jar names separated by space"
...
* commit 'a292b7b02bdf051df9eebbe4a51c6a55ce91a7a2':
PRODUCT_BOOT_JARS as a list of jar names separated by space
2014-01-08 01:01:21 +00:00
Ying Wang
a292b7b02b
am 83709a21
: am 95fc1a50
: am f12d4810
: Merge "PRODUCT_BOOT_JARS as a list of jar names separated by space"
...
* commit '83709a21c1cd3cd30f193ebcb8001344647329e5':
PRODUCT_BOOT_JARS as a list of jar names separated by space
2014-01-08 00:58:31 +00:00
Ying Wang
83709a21c1
am 95fc1a50
: am f12d4810
: Merge "PRODUCT_BOOT_JARS as a list of jar names separated by space"
...
* commit '95fc1a50750f8d0341e10f7ea39d37e3af5b21f3':
PRODUCT_BOOT_JARS as a list of jar names separated by space
2014-01-08 00:53:31 +00:00
Ying Wang
95fc1a5075
am f12d4810
: Merge "PRODUCT_BOOT_JARS as a list of jar names separated by space"
...
* commit 'f12d48104ba782d877afc31a081748fdc881f2b6':
PRODUCT_BOOT_JARS as a list of jar names separated by space
2014-01-07 16:50:49 -08:00
Ying Wang
ad6674cd60
PRODUCT_BOOT_JARS as a list of jar names separated by space
...
This makes it easier for OEMs to extend the PRODUCT_BOOT_JARS in their
product configuration files.
Change-Id: I5feca2f808b1914c275f28c7a4c38cca2ba6851f
2014-01-07 14:31:49 -08:00
Narayan Kamath
8ef82240e1
Remove libSR_AudioIn from base.mk
...
This is an obsolete rule that was grandfathered in because
it was a USER module at some point. It's no longer
required, even by builds that use packages/app/VoiceDialer.
Change-Id: Ife9e89bd1b03c0364e27650863a83bad945b8089
2014-01-07 10:06:13 +00:00
Todd Poynor
1dd90e33f8
am a2466857
: build lmkd
...
* commit 'a2466857412d3abe8351f7339d4b658ab0c899b8':
build lmkd
2014-01-06 21:28:57 +00:00
Todd Poynor
a246685741
build lmkd
...
Change-Id: I5e7c785d3f76ec2d0f30ae6aa948436f5d04957b
2014-01-06 21:05:08 +00:00
Ying Wang
65cd1e9535
am b86c34ae
: am f05eecc3
: am a47d12e3
: Merge "Remove LOCAL_SRC_FILES as precondition of enabling dexpreopt"
...
* commit 'b86c34ae64177ee725ebd3cad77c9f044a41d36c':
Remove LOCAL_SRC_FILES as precondition of enabling dexpreopt
2014-01-04 02:05:30 +00:00
Ying Wang
f05eecc368
am a47d12e3
: Merge "Remove LOCAL_SRC_FILES as precondition of enabling dexpreopt"
...
* commit 'a47d12e38ae38a6fdceb54172490c94408efa0de':
Remove LOCAL_SRC_FILES as precondition of enabling dexpreopt
2014-01-03 17:59:59 -08:00
Ying Wang
9db168ca5c
Remove LOCAL_SRC_FILES as precondition of enabling dexpreopt
...
Because a library or app can be built from mere static libraries,
or generated java files. For example, framework is built from only
static library framework-base but without LOCAL_SRC_FILES.
Also added framework2 to PRODUCT_PACKAGES.
Previously framework2.jar was installed by dependency explicitly
established in frameworks/base/Android.mk. That's not enough for the
.odex file.
This fixed the boot failure reported in bug 12382916.
Bug: 12382916
Change-Id: If1a70261ab2bb7fef77cf7b7b995bdc029be0fc3
2014-01-03 17:53:00 -08:00
Ying Wang
d83efed256
Merge "Remove LOCAL_SRC_FILES as precondition of enabling dexpreopt"
2014-01-04 00:51:27 +00:00
Ying Wang
8157cec3e9
Remove LOCAL_SRC_FILES as precondition of enabling dexpreopt
...
Because a library or app can be built from mere static libraries,
or generated java files. For example, framework is built from only
static library framework-base but without LOCAL_SRC_FILES.
Also added framework2 to PRODUCT_PACKAGES.
Previously framework2.jar was installed by dependency explicitly
established in frameworks/base/Android.mk. That's not enough for the
.odex file.
This fixed the boot failure reported in bug 12382916.
Bug: 12382916
Change-Id: If1a70261ab2bb7fef77cf7b7b995bdc029be0fc3
2014-01-03 16:24:56 -08:00
Nick Kralevich
f61a32a861
am 9596d117
: am 332b5f54
: am 0ce68b38
: am 6e8ffe3f
: Merge "Allow execmem and ashmem_device execute as required."
...
* commit '9596d11786c2dd61d0c7aee83a65461663158a0f':
Allow execmem and ashmem_device execute as required.
2014-01-02 20:02:18 +00:00
Nick Kralevich
9596d11786
am 332b5f54
: am 0ce68b38
: am 6e8ffe3f
: Merge "Allow execmem and ashmem_device execute as required."
...
* commit '332b5f549f355edf4d2953c588a818b4eae62bb1':
Allow execmem and ashmem_device execute as required.
2014-01-02 20:00:03 +00:00
Nick Kralevich
0ce68b3853
am 6e8ffe3f
: Merge "Allow execmem and ashmem_device execute as required."
...
* commit '6e8ffe3f1e328ee71354b539e63b34b2342160a8':
Allow execmem and ashmem_device execute as required.
2014-01-02 11:54:59 -08:00
Nick Kralevich
6e8ffe3f1e
Merge "Allow execmem and ashmem_device execute as required."
2014-01-02 19:50:10 +00:00
David Wagner
48b4946474
Vibra: emulator: compile and stage vibrator.goldfish
...
Following the new vibrator hardware module implementation, the
goldfish vibrator module is no longer integrated in the default
vibrator implementation and therefore needs to be explicitly built
for the emulator.
This patch is related to others in:
- hardware/libhardware
- hardware/libhardware_legacy
- frameworks/base
- device/generic/goldfish
Change-Id: I844279f5535289f079d412fdc44c5cb3c9c1130c
Signed-off-by: David Wagner <david.wagner@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 94611
2013-12-30 15:45:12 +01:00
Ying Wang
854588d99c
am 250e03f2
: am 403346a8
: am 06d914c8
: am d23bd8f5
: Merge "e2fsck missing from emulator"
...
* commit '250e03f2a10956ad05d94c348957b01ccff3ad46':
e2fsck missing from emulator
2013-12-27 20:54:19 +00:00
Ying Wang
250e03f2a1
am 403346a8
: am 06d914c8
: am d23bd8f5
: Merge "e2fsck missing from emulator"
...
* commit '403346a85085804c1de6c2586342aa90c4521f19':
e2fsck missing from emulator
2013-12-27 20:52:19 +00:00
Ying Wang
06d914c841
am d23bd8f5
: Merge "e2fsck missing from emulator"
...
* commit 'd23bd8f59f396ecd23a54d4e9b798bc872a2e505':
e2fsck missing from emulator
2013-12-27 12:46:31 -08:00
Eric Frohnhoefer
0214b3fa3c
e2fsck missing from emulator
...
The emulator file system was recently switched to ext4 however, e2fsck was not
added to the emulator build.
Change-Id: I94621c148fa40d6042b5c86a26815d867a417a6c
See: https://code.google.com/p/android/issues/detail?id=64144
2013-12-27 15:30:15 -05:00
Stephen Smalley
61c7107df3
Allow execmem and ashmem_device execute as required.
...
bootanim requires execmem.
bootanim and surfaceflinger requires execute to ashmem_device.
Change-Id: I3b4964c5acd31a44ce81672077c70353a375c072
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2013-12-24 11:43:25 -05:00
Nick Kralevich
4d95e43155
am 66b4b433
: am 224c60c3
: am da5d54c8
: am dfabbc68
: Merge "Add policy for x86 emulator."
...
* commit '66b4b433012c6c1a9fc9cd07e8210e449bd683cd':
Add policy for x86 emulator.
2013-12-20 22:51:33 +00:00
Nick Kralevich
66b4b43301
am 224c60c3
: am da5d54c8
: am dfabbc68
: Merge "Add policy for x86 emulator."
...
* commit '224c60c337490e095d402e63961bdc8ae9ebd70c':
Add policy for x86 emulator.
2013-12-20 21:11:15 +00:00
Nick Kralevich
da5d54c8ce
am dfabbc68
: Merge "Add policy for x86 emulator."
...
* commit 'dfabbc6863494374396a94181c408348824b37ab':
Add policy for x86 emulator.
2013-12-20 13:06:07 -08:00
Stephen Smalley
737f9a167a
Add policy for x86 emulator.
2013-12-20 14:33:55 -05:00
Ying Wang
057375d783
am 03a06f41
: am 9507a0fd
: am 82c59aef
: am 71e8a22e
: Merge "Add DEXPREOPT support for ART"
...
* commit '03a06f4158e9eea9152f25286fcf2c30044d4e06':
Add DEXPREOPT support for ART
2013-12-18 01:06:10 +00:00
Ying Wang
03a06f4158
am 9507a0fd
: am 82c59aef
: am 71e8a22e
: Merge "Add DEXPREOPT support for ART"
...
* commit '9507a0fd36812b27171e8f947d47421005736d25':
Add DEXPREOPT support for ART
2013-12-18 01:03:09 +00:00
Ying Wang
82c59aefcd
am 71e8a22e
: Merge "Add DEXPREOPT support for ART"
...
* commit '71e8a22e3478b6b4277957ef47486058a5306286':
Add DEXPREOPT support for ART
2013-12-17 16:58:43 -08:00
Brian Carlstrom
ced4bff58e
Add DEXPREOPT support for ART
...
Change-Id: I24d0d7b2a23a769f5d69bd4dc14be22e1475b759
2013-12-17 14:44:00 -08:00
Alex Ray
c1f67e5228
DO NOT MERGE: tiny: generic product configs for super-low-mem devices
...
and no telephony
Change-Id: I0ab958daf810ac87bca45e3bce79b87efff128b2
2013-12-09 15:09:06 -08:00
The Android Open Source Project
722581a598
Merge commit 'd54f8c2d1b4d88db84465fee93aa29103ca32078' into HEAD
...
Change-Id: I3cf53f083dee277a450dac36b011bc83180f6294
2013-12-05 12:59:39 -08:00
Ying Wang
e64a7058c9
am 48feb167
: am a395c6c1
: am 18ee9e5e
: Merge "Push wpa_supplicant modules down to the leaf product config."
...
* commit '48feb167d5064be1f12e856217d3f4358f324486':
Push wpa_supplicant modules down to the leaf product config.
2013-12-05 20:41:02 +00:00
Ying Wang
3e0ee80b53
am 41e5c401
: am 404f32d1
: am 1caa938a
: Merge "Explictly set WPA_SUPPLICANT_VERSION := VER_0_8_X for the generic devices"
...
* commit '41e5c4010627cd286f3e74697cb0e2792c357fea':
Explictly set WPA_SUPPLICANT_VERSION := VER_0_8_X for the generic devices
2013-12-05 20:41:00 +00:00
Ying Wang
a395c6c1e4
am 18ee9e5e
: Merge "Push wpa_supplicant modules down to the leaf product config."
...
* commit '18ee9e5e7de08933a04137e560bff87b113adb21':
Push wpa_supplicant modules down to the leaf product config.
2013-12-05 12:25:33 -08:00
Ying Wang
730511d9c4
am 3bd3693d
: Merge "Delete board config for the unused "emulator" device."
...
* commit '3bd3693dd0a0b514d6b1e9cbce052dee1940166b':
Delete board config for the unused "emulator" device.
2013-12-05 12:25:32 -08:00
Ying Wang
404f32d120
am 1caa938a
: Merge "Explictly set WPA_SUPPLICANT_VERSION := VER_0_8_X for the generic devices"
...
* commit '1caa938a22606a55103318df82a31a92f47900da':
Explictly set WPA_SUPPLICANT_VERSION := VER_0_8_X for the generic devices
2013-12-05 12:25:31 -08:00
Ying Wang
17fc3d2ac1
Push wpa_supplicant modules down to the leaf product config.
...
Since 558477c0b2a5a7db679c1ad7551d43e6364d1df2 in
external/wpa_supplicant_8 we don't need those modules if
WPA_SUPPLICANT_VERSION is not set by the BoardConfig.mk.
Actually the generic devices don't need them.
Change-Id: Iff7c1fbf483bd16d5f898836c4e7401d56def80f
Conflicts:
target/product/core_tiny.mk
2013-12-05 10:12:01 -08:00
Ying Wang
817d803c65
Delete board config for the unused "emulator" device.
...
Change-Id: I1e1d47fece4113be9f31f04775c5b310d28017e3
2013-12-05 10:08:10 -08:00
Ying Wang
ab6b4e0e22
Explictly set WPA_SUPPLICANT_VERSION := VER_0_8_X for the generic devices
...
Since 558477c0b2a5a7db679c1ad7551d43e6364d1df2 in
external/wpa_supplicant_8 we don't have WPA_SUPPLICANT_VERSION default
to VER_0_8_X.
This fixes the SDK build.
Change-Id: Ib7a8e10705dc6b987b60b1308405e89eaa2a47c9
2013-12-05 10:07:38 -08: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
c1f8360248
Push wpa_supplicant modules down to the leaf product config.
...
Since 558477c0b2a5a7db679c1ad7551d43e6364d1df2 in
external/wpa_supplicant_8 we don't need those modules if
WPA_SUPPLICANT_VERSION is not set by the BoardConfig.mk.
Actually the generic devices don't need them.
Change-Id: Iff7c1fbf483bd16d5f898836c4e7401d56def80f
2013-11-25 13:59:46 -08:00
Ying Wang
63ab7d8119
Delete board config for the unused "emulator" device.
...
Change-Id: I1e1d47fece4113be9f31f04775c5b310d28017e3
2013-11-25 11:16:13 -08:00
Ying Wang
5abaa4eead
Explictly set WPA_SUPPLICANT_VERSION := VER_0_8_X for the generic devices
...
Since 558477c0b2a5a7db679c1ad7551d43e6364d1df2 in
external/wpa_supplicant_8 we don't have WPA_SUPPLICANT_VERSION default
to VER_0_8_X.
This fixes the SDK build.
Change-Id: Ib7a8e10705dc6b987b60b1308405e89eaa2a47c9
2013-11-25 10:46:35 -08:00
The Android Open Source Project
b9041a45b1
Merge commit 'c73341006286c391ae4d268a77f5e008045d5308' into HEAD
...
Change-Id: I4bf7d32d65e19dfa1f0533fdd3b2295c50b13005
2013-11-22 11:06:11 -08:00
Ying Wang
dbdf467f1d
Remove the unused large_emu_hw.mk
...
Change-Id: Iea8330e00983f4eac44d8a072c1bf185afcf6a80
2013-11-20 16:41:18 -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
Amith Yamasani
2df5907e0b
Merge "tiny: generic product configs for super-low-mem devices"
2013-11-18 19:13:19 +00:00
Geremy Condra
fd6f7513f8
Add support for verity builds to the build system.
...
Change-Id: I3ef908d8d52ec88de453b161bbc3f198517a72f1
2013-11-17 16:09:34 -08:00
Alex Ray
c8bbe3a211
tiny: generic product configs for super-low-mem devices
...
and no telephony
Change-Id: Id9507d21118710a9e3d8860d2c58a55f9a31597e
2013-11-15 16:49:43 -08:00
Jeff Brown
6bc714810b
am c4c92f1c
: am e17927e0
: Merge "Add a platform library for remote display providers." into klp-dev
...
* commit 'c4c92f1c73933ed98205409d23e5e71e631c03e1':
Add a platform library for remote display providers.
2013-11-07 17:47:17 -08:00
Jeff Brown
c4c92f1c73
am e17927e0
: Merge "Add a platform library for remote display providers." into klp-dev
...
* commit 'e17927e0859778638781d75e33a3d4c5184583c4':
Add a platform library for remote display providers.
2013-11-07 17:44:06 -08:00
Elliott Hughes
2773ab94d7
am 36e681b0
: resolved conflicts for merge of 12f87a5b
to klp-dev-plus-aosp
...
* commit '36e681b02a7cd2554f038bcac65d7fdfc7889273':
Remove the hacks needed to support ash and mksh concurrently.
2013-11-07 09:44:31 -08:00
Elliott Hughes
36e681b02a
resolved conflicts for merge of 12f87a5b
to klp-dev-plus-aosp
...
Change-Id: I8ce0a86bbaae0c1e3ce5ed46de628ea22ea17d16
2013-11-07 09:08:00 -08:00
Elliott Hughes
12f87a5b77
am a05365ce
: Merge "Remove the hacks needed to support ash and mksh concurrently."
...
* commit 'a05365ceceaead86651f61f7ba66153e36b7be5d':
Remove the hacks needed to support ash and mksh concurrently.
2013-11-07 08:35:17 -08:00
Elliott Hughes
a05365cece
Merge "Remove the hacks needed to support ash and mksh concurrently."
2013-11-07 16:07:32 +00:00
Nick Kralevich
3729bace05
am 8eec26e2
: am 7717bcba
: am 240cd127
: Merge "Move goldfish-specific policy rules to their own directory."
...
* commit '8eec26e2765d6e83f8509beb610caef936a11a35':
Move goldfish-specific policy rules to their own directory.
2013-11-06 16:15:43 -08:00
Nick Kralevich
8eec26e276
am 7717bcba
: am 240cd127
: Merge "Move goldfish-specific policy rules to their own directory."
...
* commit '7717bcba28ce55bac10f6586feff89da569ff62b':
Move goldfish-specific policy rules to their own directory.
2013-11-06 16:10:16 -08:00
Nick Kralevich
7717bcba28
am 240cd127
: Merge "Move goldfish-specific policy rules to their own directory."
...
* commit '240cd127eb0a14515b37b2e691645a1e83ab31f9':
Move goldfish-specific policy rules to their own directory.
2013-11-06 16:02:06 -08:00
Stephen Smalley
1d5352eaa3
Move goldfish-specific policy rules to their own directory.
...
Change-Id: I1bdd80f641db05fef4714654515c1e1fbb259794
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2013-11-06 10:24:14 -05:00
Jeff Brown
2cbae109be
Add a platform library for remote display providers.
...
Bug: 11257292
Change-Id: Ia0207010c2f3ae143b483e9c1aa6643142740312
2013-11-05 22:17:57 -08:00
Elliott Hughes
32bfd70333
Remove the hacks needed to support ash and mksh concurrently.
...
We no longer have ash, and we'd rather not have unnecessary symbolic links
on the system.
Change-Id: Icfb1a51f1baaf1861c203f6ed93843b094deb65d
2013-11-05 11:13:49 -08:00
Alex Medina
aac6ef5905
am f9f05814
: am 0068d25b
: Include drawables for all densities - b/11270325
...
* commit 'f9f0581405d09ee6d0d4d9c8350dc3a749606fd6':
Include drawables for all densities - b/11270325
2013-10-18 18:21:23 -07:00
Alex Medina
f9f0581405
am 0068d25b
: Include drawables for all densities - b/11270325
...
* commit '0068d25b4895162993118fe3b61d2775fa575e70':
Include drawables for all densities - b/11270325
2013-10-18 18:17:47 -07:00
Alex Medina
0068d25b48
Include drawables for all densities - b/11270325
...
Change-Id: I0b1f9b930a13982756dca9428ca91aec0ef343f5
2013-10-18 13:42:42 -07:00
Jeff Sharkey
eb7bbae063
am 7732eb5b
: am 53619434
: Merge "Add blkid to all builds for use by vold." into klp-dev
...
* commit '7732eb5bbad2c8f0c2ea850bcc97cf19d4a6bc58':
Add blkid to all builds for use by vold.
2013-10-17 09:43:29 -07:00
Jeff Sharkey
7732eb5bba
am 53619434
: Merge "Add blkid to all builds for use by vold." into klp-dev
...
* commit '53619434ed56043841256dfb2074662dbd0acc5e':
Add blkid to all builds for use by vold.
2013-10-17 09:40:29 -07:00
Jeff Sharkey
1eb5eb1743
Add blkid to all builds for use by vold.
...
vold now uses blkid to extract UUID and label information from
inserted physical devices.
Bug: 11175082
Change-Id: I56ebe733ff85a498f6d3cbdcf21d40ddc6123f82
2013-10-16 16:31:57 -07:00
Jamie Gennis
53d729aeec
am 1a63bb66
: am e652af1e
: Merge "BoardConfig: Add and document vsync phase offset setting" into klp-dev
...
* commit '1a63bb6619df9413a6675addd93359de3409b539':
BoardConfig: Add and document vsync phase offset setting
2013-10-08 17:44:51 -07:00
Jamie Gennis
1a63bb6619
am e652af1e
: Merge "BoardConfig: Add and document vsync phase offset setting" into klp-dev
...
* commit 'e652af1e808b2b15e23bc472f9be6592735a0a8e':
BoardConfig: Add and document vsync phase offset setting
2013-10-08 15:13:47 -07:00
Jamie Gennis
782f2ad375
BoardConfig: Add and document vsync phase offset setting
...
Bug: 10624956
Change-Id: I82def5730f9d09396809d4b8cd2ea44829b21f22
2013-10-07 18:01:17 -07:00
Ben Cheng
4db0d18d36
am a698dab8
: am 0b42554f
: am 12eeb000
: Merge "Add generic aarch64 board config and build rules."
...
* commit 'a698dab816aa79c88b14a84b9701ca48645bf70d':
Add generic aarch64 board config and build rules.
2013-10-07 14:44:05 -07:00
Ben Cheng
a698dab816
am 0b42554f
: am 12eeb000
: Merge "Add generic aarch64 board config and build rules."
...
* commit '0b42554fd8c7a43ca45504e4586f1eef578308de':
Add generic aarch64 board config and build rules.
2013-10-07 14:42:10 -07:00
Ben Cheng
0b42554fd8
am 12eeb000
: Merge "Add generic aarch64 board config and build rules."
...
* commit '12eeb000601883256f306c2c6932cda4d768e97a':
Add generic aarch64 board config and build rules.
2013-10-07 14:40:42 -07:00
Ben Cheng
db4fc200c4
Add generic aarch64 board config and build rules.
...
Change-Id: I8b4a377596705dfa0a3bd234162d183ec2ae9530
2013-10-07 13:58:27 -07:00
Justin Koh
9458f27b5d
am b49641c4
: am 752cd60d
: Merge "Move DownloadProviderUi from core_minimal to core.mk" into klp-dev
...
* commit 'b49641c4fd5cfa5e07b4d56a9abb821915736857':
Move DownloadProviderUi from core_minimal to core.mk
2013-10-02 16:35:32 -07:00
Justin Koh
b49641c4fd
am 752cd60d
: Merge "Move DownloadProviderUi from core_minimal to core.mk" into klp-dev
...
* commit '752cd60d468136d95b9a040eede9e5ff884820a4':
Move DownloadProviderUi from core_minimal to core.mk
2013-10-02 16:17:50 -07:00
Ying Wang
441a474293
am 6a6db943
: am ab7b53b8
: am 5d92a933
: Merge "x86_64: Adding new target"
...
* commit '6a6db9432f3d3f5c65cc1fc07465420062c26724':
x86_64: Adding new target
2013-10-02 15:08:53 -07:00
Ying Wang
6a6db9432f
am ab7b53b8
: am 5d92a933
: Merge "x86_64: Adding new target"
...
* commit 'ab7b53b8e09e3d346384a5257e8f7a440a53dfc0':
x86_64: Adding new target
2013-10-02 15:06:02 -07:00
Ying Wang
ab7b53b8e0
am 5d92a933
: Merge "x86_64: Adding new target"
...
* commit '5d92a933dcc1a9ddb99b8818c8a13e208ffc22ce':
x86_64: Adding new target
2013-10-02 15:02:51 -07:00
Justin Koh
066375a869
Move DownloadProviderUi from core_minimal to core.mk
...
Move DownloadProviderUi from core_minimal to core.mk. This UI requires
DocumentsUi so it doesn't make sense to ship it on devices which are only
using core_minimal.
Change-Id: Id8a4f2a9835a05e9281596dbd5ca7b8e76062cd4
2013-10-02 14:32:15 -07:00
Pavel Chupin
fd82a49e04
x86_64: Adding new target
...
Add x86_64 Android builds. Compiler is expected to be able to understand
-m64 code generation option.
Change-Id: I99e7337c5a5766afc5e528a481bd21631ff44dd5
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
2013-10-02 20:58:54 +04:00
Ben Gilad
fb67ae817a
am 1da0541b
: am d7992e95
: Replace a dangling refeence to packages/apps/Phone.
...
* commit '1da0541b7be70e97f7697d2ac766cebbc3984a59':
Replace a dangling refeence to packages/apps/Phone.
2013-10-02 09:56:56 -07: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
Brian Carlstrom
e7648fe4f5
am a0cf24a8
: am 71fc41df
: Enable art for user builds
...
* commit 'a0cf24a8055a84e30b5eb5d54067eb99d731b749':
Enable art for user builds
2013-09-20 11:20:15 -07:00
Brian Carlstrom
a0cf24a805
am 71fc41df
: Enable art for user builds
...
* commit '71fc41df1eea345949e8e838b573ac367a52f9c7':
Enable art for user builds
2013-09-19 16:03:32 -07:00
Brian Carlstrom
71fc41df1e
Enable art for user builds
...
Bug: 10069754
Change-Id: Iaaff33a97bd7b68b2e8d84cd0034b15dde8a4316
2013-09-19 15:07:28 -07:00
Brian Carlstrom
9ae7723e2b
am cd3641fa
: am 24cffbac
: Merge "Add oatdump for ART to go with dexdump for Dalvik" into klp-dev
...
* commit 'cd3641fab276a7d60deec2ca814d1d92907e12af':
Add oatdump for ART to go with dexdump for Dalvik
2013-09-17 23:46:04 -07:00
Brian Carlstrom
cd3641fab2
am 24cffbac
: Merge "Add oatdump for ART to go with dexdump for Dalvik" into klp-dev
...
* commit '24cffbac65dfc1dd17f45dc008abc36140c81032':
Add oatdump for ART to go with dexdump for Dalvik
2013-09-17 23:43:55 -07:00
Brian Carlstrom
24cffbac65
Merge "Add oatdump for ART to go with dexdump for Dalvik" into klp-dev
2013-09-18 06:41:37 +00:00
Jean-Michel Trivi
dc94a4f63e
am 9532dca4
: am 22b85cc1
: Merge "Add loudness enhancer to platform" into klp-dev
...
* commit '9532dca41f3fdb63c01a41c75bfaf634cf949e9e':
Add loudness enhancer to platform
2013-09-17 19:29:13 -07:00
Jean-Michel Trivi
9532dca41f
am 22b85cc1
: Merge "Add loudness enhancer to platform" into klp-dev
...
* commit '22b85cc1144b0710a611ac8e0568b73fe3a52368':
Add loudness enhancer to platform
2013-09-17 18:53:08 -07:00
Jean-Michel Trivi
22b85cc114
Merge "Add loudness enhancer to platform" into klp-dev
2013-09-18 01:48:35 +00:00
Brian Carlstrom
0354c908e2
Add oatdump for ART to go with dexdump for Dalvik
...
Bug: 10807447
Change-Id: I48d1bc0ca025215383161dbf160d4f9270d97496
2013-09-17 18:29:29 -07:00
Michael Jurka
14b8b9927e
am c0db1fb8
: am f52651ef
: Merge "Add default WallpaperCropper to the build" into klp-dev
...
* commit 'c0db1fb812ba4b110dd187152701acc4b6aa3d58':
Add default WallpaperCropper to the build
2013-09-16 12:19:03 -07:00
Michael Jurka
c0db1fb812
am f52651ef
: Merge "Add default WallpaperCropper to the build" into klp-dev
...
* commit 'f52651ef2791292ba6c50f98a6558e9e0a3b0b61':
Add default WallpaperCropper to the build
2013-09-16 12:16:53 -07:00
Michael Jurka
f52651ef27
Merge "Add default WallpaperCropper to the build" into klp-dev
2013-09-16 19:13:56 +00:00
Jeff Sharkey
3fc8f6c601
am 6c4acc11
: am f8068c2f
: Remove Terminal for now.
...
* commit '6c4acc1135d171158ac195466441c7401502968f':
Remove Terminal for now.
2013-09-16 10:48:37 -07:00
Jeff Sharkey
6c4acc1135
am f8068c2f
: Remove Terminal for now.
...
* commit 'f8068c2fbcd149547f4c6e35a091745927712a22':
Remove Terminal for now.
2013-09-16 10:45:09 -07:00
Jeff Sharkey
f8068c2fbc
Remove Terminal for now.
...
Bug: 10780928
Change-Id: Iab3991e8d7df7d29e108e389ea18702c5e7efa25
2013-09-16 10:37:36 -07:00
Jean-Michel Trivi
3211cb8e25
Add loudness enhancer to platform
...
Add loudness enhancement audio effect to the platform.
Bug 8413913
Change-Id: I00cf4ca6f68572594731102d33ae525b57d43d96
2013-09-16 10:15:34 -07:00
Michael Jurka
dea7975bf1
Add default WallpaperCropper to the build
2013-09-16 13:08:02 +02:00
Torne (Richard Coles)
838a16dbf6
am d6d4cfed
: am 5839c0f2
: Remove libchromium_net from the base product.
...
* commit 'd6d4cfedf03e78a4dc90ec29f19b6bc08a1846f3':
Remove libchromium_net from the base product.
2013-09-12 10:01:01 -07:00
Torne (Richard Coles)
d6d4cfedf0
am 5839c0f2
: Remove libchromium_net from the base product.
...
* commit '5839c0f23deb80cce3314172d23ba5926262aef4':
Remove libchromium_net from the base product.
2013-09-12 09:49:01 -07:00
Torne (Richard Coles)
5839c0f23d
Remove libchromium_net from the base product.
...
The Chromium network stack is only needed by libwebcore and stagefright,
both of which already explicitly depend on it, so there's no need for it
to be in the base package list.
Bug: 10427705
Change-Id: Ifbb089de867c577788c6310571337c39c4ce31e0
2013-09-12 14:55:36 +01:00
Victoria Lease
65202c593d
include external/sil-fonts
...
Bug: 10625246
Change-Id: I15c655030557e91663635b70848da86c9e0221e7
(cherry picked from commit fd1327256e
)
2013-09-11 18:01:30 +00:00
Victoria Lease
850d356e50
am 47670f7d
: am fd132725
: include external/sil-fonts
...
* commit '47670f7d18bf9b698e839e71f42d881417268386':
include external/sil-fonts
2013-09-06 16:12:33 -07:00
Victoria Lease
47670f7d18
am fd132725
: include external/sil-fonts
...
* commit 'fd1327256e698a7b5dd677bea45947fd20b23208':
include external/sil-fonts
2013-09-06 16:07:12 -07:00
Victoria Lease
fd1327256e
include external/sil-fonts
...
Bug: 10625246
Change-Id: I15c655030557e91663635b70848da86c9e0221e7
2013-09-06 14:00:38 -07:00
Eric Laurent
9cfb045939
am b2106e47
: am 7e258f11
: Merge "add libeffectproxy for audio effects offloading" into klp-dev
...
* commit 'b2106e47d90f7138d750720b482526149232acb4':
add libeffectproxy for audio effects offloading
2013-09-06 13:32:37 -07:00
Eric Laurent
b2106e47d9
am 7e258f11
: Merge "add libeffectproxy for audio effects offloading" into klp-dev
...
* commit '7e258f11064d51413e5e53fba842ace016ebc032':
add libeffectproxy for audio effects offloading
2013-09-06 12:58:08 -07:00
Eric Laurent
aaa85b948e
add libeffectproxy for audio effects offloading
...
libeffectproxy is used when offloading audio effects to
a DSP. It is a framework component working with the audio
effects factory in libeffects that must be present on all
products.
Bug: 8174034.
Change-Id: I5035884735a370e9fe87467a45efbf24ba190886
2013-09-06 10:46:05 -07:00
Santos Cordon
296048e1a8
am 072248aa
: am 9647ca3d
: Combining InCallUI & Dialer (part 2)
...
* commit '072248aa5bac9985e23d68b4d2a38074096751bc':
Combining InCallUI & Dialer (part 2)
2013-09-04 14:35:06 -07:00
Santos Cordon
072248aa5b
am 9647ca3d
: Combining InCallUI & Dialer (part 2)
...
* commit '9647ca3d8e9e4799d41c436db5f594ad32397290':
Combining InCallUI & Dialer (part 2)
2013-09-04 14:31:38 -07:00
Santos Cordon
9647ca3d8e
Combining InCallUI & Dialer (part 2)
...
Removing InCallUI from generic product.
InCallUI code was built into Dialer so this APK is now redundant
bug:10605332
Change-Id: Icfaf0b1975f2d6749c837f42ee309e17c9d08e23
2013-09-03 18:37:35 -07:00
Todd Poynor
6365c44054
build lmkd
...
Change-Id: I5e7c785d3f76ec2d0f30ae6aa948436f5d04957b
2013-08-31 01:09:06 +00:00
Geremy Condra
98cd36527a
am 3e272fd4
: am f482fa84
: am d7a9f708
: Merge "Hmm, contrary to Deckard\'s assurances, this broke internally. Reverting."
...
* commit '3e272fd4081a74066515e85ae23e08cdd0685b40':
Hmm, contrary to Deckard's assurances, this broke internally. Reverting.
2013-08-26 14:52:35 -07:00
Geremy Condra
3e272fd408
am f482fa84
: am d7a9f708
: Merge "Hmm, contrary to Deckard\'s assurances, this broke internally. Reverting."
...
* commit 'f482fa848055925d8abe4a8a7f4801bc6c8fc291':
Hmm, contrary to Deckard's assurances, this broke internally. Reverting.
2013-08-26 14:49:45 -07:00
Geremy Condra
f482fa8480
am d7a9f708
: Merge "Hmm, contrary to Deckard\'s assurances, this broke internally. Reverting."
...
* commit 'd7a9f708870ebd82bc57e478541068bb7ed987c4':
Hmm, contrary to Deckard's assurances, this broke internally. Reverting.
2013-08-26 14:47:33 -07:00
Geremy Condra
572c5f0667
Hmm, contrary to Deckard's assurances, this broke internally. Reverting.
...
Change-Id: I0d7892cd619e742fb5d6b1bda6d0dba7d6cd47bf
2013-08-26 21:27:56 +00:00
Geremy Condra
00ed2089e6
am 8e3321c5
: am 2724d8c4
: am d5ec4db7
: Merge "Add sepolicy_version to PRODUCT_PACKAGES"
...
* commit '8e3321c5853aa91353b8545ed66760d95c11720b':
Add sepolicy_version to PRODUCT_PACKAGES
2013-08-26 14:23:04 -07:00
Geremy Condra
8e3321c585
am 2724d8c4
: am d5ec4db7
: Merge "Add sepolicy_version to PRODUCT_PACKAGES"
...
* commit '2724d8c4ac1a8eea593425d682e7244a8e5cc9da':
Add sepolicy_version to PRODUCT_PACKAGES
2013-08-26 14:20:38 -07:00
Geremy Condra
2724d8c4ac
am d5ec4db7
: Merge "Add sepolicy_version to PRODUCT_PACKAGES"
...
* commit 'd5ec4db790c59980ed6e38ebed32e89bca8ee13f':
Add sepolicy_version to PRODUCT_PACKAGES
2013-08-26 14:18:41 -07:00
William Roberts
711b8d5e13
Add sepolicy_version to PRODUCT_PACKAGES
...
Change-Id: I3d2652dd594d272507c0a1485e21227149ee4af7
Signed-off-by: William Roberts <wroberts@tresys.com>
2013-08-23 09:18:17 -07:00
Jeff Brown
abad7c39f8
am af57f8f8
: Remove input flinger stubs. (DO NOT MERGE)
...
* commit 'af57f8f8cd9e245331505b599dccfa3e9d43fc6a':
Remove input flinger stubs. (DO NOT MERGE)
2013-08-22 19:34:05 -07:00
Jeff Brown
af57f8f8cd
Remove input flinger stubs. (DO NOT MERGE)
...
Bug: 10446930
Change-Id: Ifea564dce9b7b2f8a792dde4119316211febfd59
2013-08-22 18:37:11 -07:00
Baligh Uddin
a3d6a790f9
am a01ec9bb
: Add New languages.
...
* commit 'a01ec9bbdd3fe554e00fdd79b5f1ad063c477581':
Add New languages.
2013-08-21 12:46:51 -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
Baligh Uddin
a01ec9bbdd
Add New languages.
...
Bug: 10246852
2013-08-21 12:44:02 -07:00
Ying Wang
ac2cb39650
am 929b3a24
: Merge "Adding the missing audio files into the SDK system image"
...
* commit '929b3a24b0c1b1ff2488ef08f05040c63aeaa9ed':
Adding the missing audio files into the SDK system image
2013-08-21 12:43:55 -07:00
Mathew Inwood
0735c5f08c
Remove ApplicationsProvider.
...
ApplicationsProvider is going away since it's no longer needed. Remove it
from the build config.
Also add cleansteps to remove the APK & intermediates.
Bug: 10407790
Change-Id: I0b273d22e309822fde6d753b541f7ac648607b4e
2013-08-21 17:34:34 +01:00
Jason Monk
5cdc0a9323
Remove old PAC dependency and add new one.
...
PAC support has been changed from a standalone executable to an apk
that needs to be part of the build. This removes the old depency
and adds the new one.
Bug: 10182711
Change-Id: I1291f54d81e6ec0c775e045a3446bd0cffb40019
2013-08-19 15:42:32 -04:00
Vineeta Srivastava
477b12b45a
Fix missing camera from aosp builds.
...
Camera is no longer part of Gallery2 application. Added Camera2 for aosp builds.
Bug: 10324351
Change-Id: I6c468344af04106704876ac945ccaffd9be1674b
2013-08-14 13:29:33 -07:00
Santos Cordon
883b1c4ee2
Merge "The big switch. Enabling InCallUi/Phone split by default." into klp-dev
2013-08-13 22:11:26 +00:00
Santos Cordon
717764ea9c
The big switch. Enabling InCallUi/Phone split by default.
...
.:::. .:::.
:::::::.:::::::
:::::::::::::::
':::::::::::::'
':::::::::'
':::::'
':'
with love, from California
Change-Id: Iba25accb46f81f0c36a9e3f1df0f990e27f51b9f
2013-08-12 21:50:38 -07:00
Ying Wang
ad7fd29b31
Don't bother going through the source tree
...
Don't bother going through the source tree in more circumstances:
all cleaning goals, helping goals, no-deps goals.
Bug: 10244578
Change-Id: Id53a249085c62838e4193962a85e0ac34f46954f
2013-08-09 10:08:30 -07:00
Jason Monk
89fa610033
Merge "Add libpac, pacserver, and ProxyHandler to build."
2013-08-08 02:41:29 +00:00
Jason Monk
b5e2c29dba
Add libpac, pacserver, and ProxyHandler to build.
...
This allows frameworks to reference libpac, ProxyHandler and pacserver as
required to add PAC support.
bug:10182711
Change-Id: Iffac836a517518bd4b9a473e09372fbd10315539
2013-08-08 01:39:10 +00: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
Stuart Scott
ee0748821f
Add boot jars to fix Dalvik missing bootclasspath for mini emulator.
...
bug: 10146858
Change-Id: I159a5951a036f32c7eb02569c5b0fb12ce3a76dd
2013-08-05 16:05:08 -07:00
Stephen Hines
79ee17eaa4
am 367e56f1
: am 3fc8dacd
: Remove abcc from build.
...
* commit '367e56f1b7d79086785f61c8c522644f134c3136':
Remove abcc from build.
2013-08-02 17:40:58 -07:00
Stephen Hines
3fc8dacd92
Remove abcc from build.
...
Change-Id: I9ca5deea98adbba03081349c16a391a9dd84e347
2013-08-02 11:33:13 -07:00
Stuart Scott
c95e83d161
Changing make hierarchy of mini.
...
bug: 8503391
Change-Id: I22f2048cec7f232010e00109ef82bed271602cb1
2013-08-02 02:04:56 +00:00
Elliott Hughes
c22bb6ecab
Remove one last icu.dat.
...
Change-Id: Iadeae68e49b18d735e7cfc263800c96998efd23b
2013-07-31 16:25:26 -07:00
Elliott Hughes
6f16857720
resolved conflicts for merge of 8714c831
to master
...
Change-Id: I58a6ab217aeaa5de099a9d79d1830c833f718a9d
2013-07-31 15:49:04 -07:00
Elliott Hughes
2092dc9dbc
Remove the bogus icu.dat dependency.
...
Simply depending on the icu4c libraries now pulls in the appropriate
data files for you.
Change-Id: Ied659584b2583c92d871c5823988ce0a865eabe4
2013-07-31 15:02:17 -07:00
Andy McFadden
64761bcdd5
Add screenrecord
...
Add the "screenrecord" command for all builds of most devices.
Change-Id: Ib4f37cc219a8d2f9a09ac3f457e5f94506a4d88d
2013-07-30 17:22:00 -07:00
Todd Poynor
2b3bd4a88b
Add healthd
...
Change-Id: I055581a12fe88a4e1fb04e675036bf0d345c05c6
2013-07-26 21:32:38 +00:00
Ying Wang
0650d1503d
Add PRODUCT_BOOT_JARS to derive BOOTCLASSPATH
...
- BOOTCLASSPATH now is product-configurable;
- No need to maintain the duplicate values in core/dex_preopt.mk.
- clean up some legacy ALL_PREBUILTs.
Bug: 9990214
Change-Id: Ie3953e66d282e335bb7782b0ebd56102c35ec10e
2013-07-24 15:15:55 -07:00
Brian Carlstrom
336b06f78c
Enable runtime_libart on darwin.
...
Change-Id: I0499bb387af827379fa4bb5e71a9770a89093c53
2013-07-23 14:24:00 -07:00
Jeff Sharkey
87ff6c2132
Merge "Add packages to support OPEN/CREATE_DOC."
2013-07-16 20:54:52 +00:00
Jeff Sharkey
680435898a
Add packages to support OPEN/CREATE_DOC.
...
Change-Id: Id9314b2ed03d6ce7cc98c051a7654c225b393954
2013-07-16 13:00:13 -07:00
Jeff Brown
bc3fe33c24
Remove old system server binaries that are no longer needed.
...
Change-Id: I76a56ee786decce9729f8f93244bdd04cbad4877
2013-07-15 15:08:37 -07:00
Jeff Brown
a114a87e70
Add inputflinger to build.
...
Change-Id: I4ae22cda74603c7cdcf09b9f63b31616b1f8e345
2013-07-15 15:08:37 -07:00
Nick Kralevich
c5e460b356
am 4e76f806
: am a682f6db
: am 4e132ca5
: Merge "emulator: increase system partition to 550M"
...
* commit '4e76f806d49c0b4e7fa31653555a5a16713a8778':
emulator: increase system partition to 550M
2013-07-12 20:48:32 -07:00
Nick Kralevich
4e76f806d4
am a682f6db
: am 4e132ca5
: Merge "emulator: increase system partition to 550M"
...
* commit 'a682f6db7b3e1259ce4abc829bd6763850565494':
emulator: increase system partition to 550M
2013-07-12 20:46:51 -07:00
Nick Kralevich
a682f6db7b
am 4e132ca5
: Merge "emulator: increase system partition to 550M"
...
* commit '4e132ca5e5c5048d7a95563eddd9f5ef11346678':
emulator: increase system partition to 550M
2013-07-12 20:44:41 -07:00
Nick Kralevich
865ffd4efe
emulator: increase system partition to 550M
...
Yes, 400M isn't enough. I can't believe it either.
Change-Id: I7d3857f04bfda472af6a281017204672bb9c9940
2013-07-12 20:28:59 -07:00
Nick Kralevich
265b8866cc
am 38437bad
: am e9ee5e11
: am 5411ef9c
: Merge "emulator: increase system partition size to 400M"
...
* commit '38437bade23ff6fc5fe5c30dacebc178c56d47ba':
emulator: increase system partition size to 400M
2013-07-12 15:20:30 -07:00
Nick Kralevich
38437bade2
am e9ee5e11
: am 5411ef9c
: Merge "emulator: increase system partition size to 400M"
...
* commit 'e9ee5e11b499f5be72b365585001e310b776d698':
emulator: increase system partition size to 400M
2013-07-12 15:17:20 -07:00
Nick Kralevich
e9ee5e11b4
am 5411ef9c
: Merge "emulator: increase system partition size to 400M"
...
* commit '5411ef9cc4a4bf5c1950df89f2b2032edcf83dc8':
emulator: increase system partition size to 400M
2013-07-12 15:15:33 -07:00
Nick Kralevich
de2709baac
emulator: increase system partition size to 400M
...
300M is too small.
Change-Id: Icbe4e76d6e5c8a50cc6e6d74e324335bc66b8466
2013-07-12 13:44:48 -07:00
Ying Wang
7600917dac
am 263359df
: am 6685bd01
: am 2476ec99
: Merge "use ext4 instead of yaffs for the emulator"
...
* commit '263359df4399e86a26a70711b8004b54c8fe44b0':
use ext4 instead of yaffs for the emulator
2013-07-12 11:14:28 -07:00
Ying Wang
263359df43
am 6685bd01
: am 2476ec99
: Merge "use ext4 instead of yaffs for the emulator"
...
* commit '6685bd01a953a550f0cebe342e9a1125adffd6b3':
use ext4 instead of yaffs for the emulator
2013-07-12 11:12:49 -07:00
Ying Wang
6685bd01a9
am 2476ec99
: Merge "use ext4 instead of yaffs for the emulator"
...
* commit '2476ec994d449d31c89571723b4b17826639c1bf':
use ext4 instead of yaffs for the emulator
2013-07-12 11:11:56 -07:00
Ying Wang
2476ec994d
Merge "use ext4 instead of yaffs for the emulator"
2013-07-12 18:10:13 +00:00
Nick Kralevich
3c9fae2840
use ext4 instead of yaffs for the emulator
...
Bug: https://code.google.com/p/android/issues/detail?id=38561
Change-Id: I7c605457b485d169654263caf55eb7d5a9a60c2e
2013-07-11 22:39:38 -07:00
Ying Wang
7ba0850a47
am 032ad054
: am a1b948af
: am cbeb6e81
: Merge "Include ping6 in all device builds"
...
* commit '032ad0542b395d1277b634b1243f36ae2100eb16':
Include ping6 in all device builds
2013-07-11 19:01:44 -07:00
Ying Wang
032ad0542b
am a1b948af
: am cbeb6e81
: Merge "Include ping6 in all device builds"
...
* commit 'a1b948afdb5a46e168cf59ea4045b63722ee8b47':
Include ping6 in all device builds
2013-07-11 18:56:02 -07:00
Ying Wang
a1b948afdb
am cbeb6e81
: Merge "Include ping6 in all device builds"
...
* commit 'cbeb6e81fe8faaa1c138ebe213d2b6e7fb0ad251':
Include ping6 in all device builds
2013-07-11 18:52:19 -07:00
Lorenzo Colitti
c5bb87fff1
Include ping6 in all device builds
...
ping6 is currently only included in debug builds. Include it
everywhere, now that it doesn't need to be setuid any more.
Bug: 9469682
Change-Id: Ia78f6b0e5fc8f7042fb99cdb4a0add426bb56c7e
2013-07-11 12:54:05 +09:00
Brian Carlstrom
4e504f170a
Disable ART runtime for darwin
...
Change-Id: Icdad4f422bacc3f997f585df48cc6f1c2d7c7642
2013-07-10 12:43:57 -07:00
Brian Carlstrom
8fd6c6b7ee
Add ART runtime to userdebug and eng builds to allow dual booting via developer options
...
Change-Id: Id3f2ffe92ca083853bd28f155a314612e8b1b2f6
2013-07-10 10:51:56 -07:00
Brian Carlstrom
544d4cd3e5
Renaming dalvik.vm.lib to persist.sys.dalvik.vm.lib
...
Change-Id: I84ecdd1250ce7b4a367f9e07c1d198ef9a7cf066
2013-07-10 09:48:35 -07:00
Lorenzo Colitti
a6e97a31df
am b1b758f5
: Don\'t build clatd without clatd.conf.
...
* commit 'b1b758f5bf30d1c6f5b0c0d5599bbe6a91d541f9':
Don't build clatd without clatd.conf.
2013-07-08 14:31:05 -07:00
Lorenzo Colitti
b1b758f5bf
Don't build clatd without clatd.conf.
...
Bug: 9730936
Change-Id: I2c50422c7b502d5b9bdc01afb55d25353f6c7088
2013-07-09 01:54:40 +09:00
Lorenzo Colitti
f0be96575b
Don't build clatd without clatd.conf.
...
Bug: 9730936
Change-Id: Id9ddf5541e894852eda8c471b9931c7c8bbbdc0a
2013-07-08 19:43:42 +09:00
Brian Carlstrom
1aeee8bb66
Move from WITH_ART to PRODUCT_RUNTIMES
...
Change-Id: I3a9217b4aafc1f59d095169deb9eaeae17320505
2013-06-27 16:49:15 -07:00
Brian Carlstrom
a4ba587282
Merge "Add support for dualbooting dalvik and art"
2013-06-26 05:30:18 +00:00
Brian Carlstrom
3d0507d3a1
Add support for dualbooting dalvik and art
...
Change-Id: I39bc909bf9ba2c8e4dc6599c84e5a6c780def43d
2013-06-25 16:36:53 -07:00
Jean-Baptiste Queru
dc31ccab64
Revert "Ship Music2, not Music"
...
This reverts commit 1ad24f57a1
.
Bug: 9518830
Change-Id: I3cfe98b418512d4d396c4528b98b978cf5bc3c30
2013-06-25 16:34:00 -07:00
Justin Ho
e18ee4606b
Merge "Ship Music2, not Music Bug: 9518830"
2013-06-24 23:21:29 +00:00
Justin Ho
1ad24f57a1
Ship Music2, not Music
...
Bug: 9518830
Change-Id: Ic0d696a958592e67bb3fc0580e9bd717b927d36b
2013-06-24 16:06:11 -07:00
Svetoslav Ganov
0402a4b12c
Print - build
...
Change-Id: I640adcc41697e609ed324bd1f1dd032e20df4933
2013-06-21 17:33:18 -07:00
Brian Carlstrom
529415b753
Add WITH_ART support to product definitions
...
Change-Id: I71f0fad07ebed73f4f69cb8c37eb1c4f88c1a9b0
2013-06-19 15:27:11 -07:00
Stephen Hines
9a90a82c92
Remove abcc from build.
...
Change-Id: I9ca5deea98adbba03081349c16a391a9dd84e347
2013-06-05 20:25:40 -07:00
gcondra@google.com
b839579681
am cc9c2135
: am 2e619b7c
: Revert "Add the sepolicy.version file to the root directory."
...
* commit 'cc9c2135bc04489c382985270d6c5a444610b57e':
Revert "Add the sepolicy.version file to the root directory."
2013-05-20 16:35:32 -07:00
gcondra@google.com
cc9c2135bc
am 2e619b7c
: Revert "Add the sepolicy.version file to the root directory."
...
* commit '2e619b7c5458cb3b381bd8a02076f549dba8d045':
Revert "Add the sepolicy.version file to the root directory."
2013-05-20 15:52:26 -07:00
repo sync
2e619b7c54
Revert "Add the sepolicy.version file to the root directory."
...
This reverts commit 83f646a0ef
.
2013-05-17 12:57:52 -07:00
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