Rom Lemarchand
ca4c088214
Merge "init: skip "name" DT entry" am: 24e3b8d091
...
am: b95031f87a
2015-11-09 17:41:09 +00:00
Rom Lemarchand
b95031f87a
Merge "init: skip "name" DT entry"
...
am: 24e3b8d091
2015-11-09 17:38:26 +00:00
Rom Lemarchand
24e3b8d091
Merge "init: skip "name" DT entry"
2015-11-09 17:35:09 +00:00
Rom Lemarchand
1dcf325844
init: skip "name" DT entry
...
DTs have a standard "name" entry which is not to be
turned into an android property, so skip it.
Change-Id: I79f6638b4123358c8d80510c1666cf5d4561160e
2015-11-08 17:51:50 -08:00
Elliott Hughes
8f9c7c33c5
Merge "AOSP master doesn\'t have "cmd"." am: 54b5e85373
...
am: b31710e7d4
2015-11-07 17:11:06 +00:00
Elliott Hughes
b31710e7d4
Merge "AOSP master doesn\'t have "cmd"."
...
am: 54b5e85373
2015-11-07 17:07:43 +00:00
Elliott Hughes
54b5e85373
Merge "AOSP master doesn't have "cmd"."
2015-11-07 17:05:12 +00:00
Elliott Hughes
39696f4ce8
Merge "use new cmd command" am: ae2a64e2ba
...
am: 143914ec2f
2015-11-07 02:09:39 +00:00
Elliott Hughes
143914ec2f
Merge "use new cmd command"
...
am: ae2a64e2ba
2015-11-07 02:07:00 +00:00
Elliott Hughes
79e1c7a7f8
AOSP master doesn't have "cmd".
...
Change-Id: I0f524b779a623a9e2db923fd9003b102460ae46f
2015-11-06 18:05:16 -08:00
Elliott Hughes
ae2a64e2ba
Merge "use new cmd command"
2015-11-07 02:03:31 +00:00
Todd Kennedy
6fa848adba
use new cmd command
...
Instead of using the pm command, 'adb install' and 'adb uninstall' will now
use the cmd command. Additionally, the APK will be streamed directly to
package installer instead of creating a temporary file.
(cherry-pick of d039800a4e008b52c532f901e3bb34b40877cf30.)
Change-Id: Ie7529afa5b039d29cc8183f36085ff4e66b3457a
2015-11-06 18:00:05 -08:00
Josh Gao
a39ff9d81b
Merge "adb: pull empty directories." am: 7fc45c3326
...
am: 92c436d38d
2015-11-07 01:00:18 +00:00
Josh Gao
a83913d344
Merge "adb: remove superfluous checks." am: 8c2fb1f3de
...
am: 68fc89d92b
2015-11-07 01:00:03 +00:00
Josh Gao
92c436d38d
Merge "adb: pull empty directories."
...
am: 7fc45c3326
2015-11-07 00:57:07 +00:00
Josh Gao
68fc89d92b
Merge "adb: remove superfluous checks."
...
am: 8c2fb1f3de
2015-11-07 00:56:50 +00:00
Josh Gao
7fc45c3326
Merge "adb: pull empty directories."
2015-11-07 00:53:03 +00:00
Josh Gao
8c2fb1f3de
Merge "adb: remove superfluous checks."
2015-11-07 00:52:12 +00:00
Josh Gao
a837df8590
adb: remove superfluous checks.
...
Change-Id: I4d9ceb301b0d242b0bad9a0faa8e2a1824f36cca
2015-11-06 15:19:53 -08:00
Josh Gao
6580096c97
adb: pull empty directories.
...
Pushing empty directories is more troublesome, and probably either
requires changes to the server, or hacky `adb shell mkdir` stuff.
Bug: http://b/25395071
Change-Id: I4db6a993429a56e5c5ca994752418503b6f5d7c4
2015-11-06 15:04:24 -08:00
Bertrand Simonnet
186a673777
Merge "metricsd: add SendBoolToUMA to metrics interface" am: 9940a132fb
...
am: bc85e34259
2015-11-06 20:52:57 +00:00
Bertrand Simonnet
bc85e34259
Merge "metricsd: add SendBoolToUMA to metrics interface"
...
am: 9940a132fb
2015-11-06 20:51:00 +00:00
Bertrand Simonnet
9940a132fb
Merge "metricsd: add SendBoolToUMA to metrics interface"
2015-11-06 20:47:58 +00:00
Josh Gao
c5cfc8571e
Merge "adb: add basename_lock to mutex_list.h." am: f00db9d8b8
...
am: 148f362579
2015-11-06 20:47:52 +00:00
Josh Gao
148f362579
Merge "adb: add basename_lock to mutex_list.h."
...
am: f00db9d8b8
2015-11-06 20:45:55 +00:00
Josh Gao
f00db9d8b8
Merge "adb: add basename_lock to mutex_list.h."
2015-11-06 20:43:49 +00:00
Josh Gao
09ef0c8953
Merge changes Iced6c414,Ie82d51ec am: a239543061
...
am: 055b81567d
2015-11-06 20:32:04 +00:00
Josh Gao
055b81567d
Merge changes Iced6c414,Ie82d51ec
...
am: a239543061
2015-11-06 20:26:25 +00:00
Josh Gao
a239543061
Merge changes Iced6c414,Ie82d51ec
...
* changes:
adb: make local_build_list match remote_build_list.
adb: C++ify more of the push/pull functions.
2015-11-06 20:22:24 +00:00
Josh Gao
250107e9f7
adb: add basename_lock to mutex_list.h.
...
Fixes crash on Windows.
Change-Id: Ic87d8ff30a2e824b6012e7e94b8d83442e17d000
2015-11-06 12:19:23 -08:00
Nathan Bullock
adc1c23537
metricsd: add SendBoolToUMA to metrics interface
...
Bug: 25561571
Change-Id: I698d2408e2f462865f6512b7be17ff0851a1f97c
2015-11-06 14:45:49 -05:00
Mark Salyzyn
861d22b505
Merge "packagelistparser: rename to libpackagelistparser" am: 588b399eb1
...
am: bddc3693ca
2015-11-06 18:19:34 +00:00
Mark Salyzyn
bddc3693ca
Merge "packagelistparser: rename to libpackagelistparser"
...
am: 588b399eb1
2015-11-06 18:17:31 +00:00
Mark Salyzyn
588b399eb1
Merge "packagelistparser: rename to libpackagelistparser"
2015-11-06 18:14:52 +00:00
Elliott Hughes
8eb5e9c370
Merge "Revert "Revert "Add MIPS64r6 support for libpixelflinger""" am: 8bc7a4d443
...
am: 9d6784fe70
2015-11-06 15:39:39 +00:00
Elliott Hughes
9d6784fe70
Merge "Revert "Revert "Add MIPS64r6 support for libpixelflinger"""
...
am: 8bc7a4d443
2015-11-06 15:36:43 +00:00
Elliott Hughes
8bc7a4d443
Merge "Revert "Revert "Add MIPS64r6 support for libpixelflinger"""
2015-11-06 15:35:27 +00:00
Elliott Hughes
606d4aecfb
Revert "Revert "Add MIPS64r6 support for libpixelflinger""
...
This reverts commit 7fd121788a
2015-11-06 16:02:25 +01:00
Daniel Rosenberg
6f62ef03c4
Merge "Fastboot changes to support A/B partitioning" am: f8e70a3a60
...
am: fb764d9373
2015-11-06 03:46:56 +00:00
Daniel Rosenberg
fb764d9373
Merge "Fastboot changes to support A/B partitioning"
...
am: f8e70a3a60
2015-11-06 03:45:00 +00:00
Daniel Rosenberg
f8e70a3a60
Merge "Fastboot changes to support A/B partitioning"
2015-11-06 03:43:49 +00:00
Daniel Rosenberg
b7bd4ae529
Fastboot changes to support A/B partitioning
...
Introduce support for -slot option for specifying slots,
and set_active, for changing the current slot.
Change-Id: Ib3b2a75491c0d0413534dd0c1d7bcb52555bba66
2015-11-05 18:07:46 -08:00
Christopher Ferris
ec038e8221
Merge "Fix bug in writing zips." am: fa5fbae27f
...
am: bd7141d890
2015-11-05 21:07:39 +00:00
Christopher Ferris
bd7141d890
Merge "Fix bug in writing zips."
...
am: fa5fbae27f
2015-11-05 21:04:53 +00:00
Christopher Ferris
fa5fbae27f
Merge "Fix bug in writing zips."
2015-11-05 21:03:09 +00:00
William Roberts
f420ff1ca7
packagelistparser: rename to libpackagelistparser
...
When packagelistparser was moved from frameworks/base/libs to system/core it
was never renamed in-line with things in system/core. Libs start with lib,
executables or subdirs do not.
For example, libusb versus logwrapper show the lib versus executable naming
split.
Change-Id: Ia1ed404347927ecfc2d037c83b2fe2a68b3966ba
Signed-off-by: William Roberts <william.c.roberts@intel.com>
2015-11-05 12:12:38 -08:00
Dan Albert
40f76c2fed
Merge "Use std::unique_ptr instead of UniquePtr." am: 0f61f86870
...
am: 0c69e9f271
2015-11-05 19:58:51 +00:00
Dan Albert
a619440436
Merge "[gatekeeperd] copy uid to local before passing to u_map" am: fe8213f0dd
...
am: a9a2eaeadc
2015-11-05 19:53:53 +00:00
Dan Albert
0c69e9f271
Merge "Use std::unique_ptr instead of UniquePtr."
...
am: 0f61f86870
2015-11-05 19:45:43 +00:00
Dan Albert
a9a2eaeadc
Merge "[gatekeeperd] copy uid to local before passing to u_map"
...
am: fe8213f0dd
2015-11-05 19:40:04 +00:00
