Commit Graph

24272 Commits

Author SHA1 Message Date
Tao Bao 78b352624d Merge "mkbootfs: Fix the default st_mode for root directory."
am: 3dee9f1f6f

Change-Id: I7672f883954112e0c1826eae8c3024f93824eaad
2016-10-08 20:24:32 +00:00
Treehugger Robot 3dee9f1f6f Merge "mkbootfs: Fix the default st_mode for root directory." 2016-10-08 20:16:57 +00:00
Yifan Hong 11373394fd Merge "Add 0X as a valid hex prefix for parseint"
am: 392a2c8f0f

Change-Id: Ia9409c0424fab1966197ea5bb7a4532ed9a8c709
2016-10-08 10:42:37 +00:00
Treehugger Robot 392a2c8f0f Merge "Add 0X as a valid hex prefix for parseint" 2016-10-08 10:36:02 +00:00
Dimitry Ivanov a46dfe2306 Merge "Revert "Revert "Revert "Revert "Remove liblog from libcutils as a whole static lib"""""
am: afda14e61d

Change-Id: I5f9d475db5e5f843f59c1a9484f4ed6174e62650
2016-10-08 07:56:21 +00:00
Dimitry Ivanov afda14e61d Merge "Revert "Revert "Revert "Revert "Remove liblog from libcutils as a whole static lib""""" 2016-10-08 07:51:33 +00:00
Chia-I Wu 462e087e40 Merge "Add native_handle_clone"
am: e8f6c7398b

Change-Id: I788664dbcd2663f197292368bb89cd1b98e9489f
2016-10-08 01:30:01 +00:00
Chia-I Wu e8f6c7398b Merge "Add native_handle_clone" 2016-10-08 01:25:35 +00:00
Yifan Hong 89fbd6349f Add 0X as a valid hex prefix for parseint
Bug: 31983995

Test: make android.hardware.tests.expression@1.0
Change-Id: I526d73f96c519f84dec93befa442b1d2fff7979b
2016-10-07 16:50:16 -07:00
Tao Bao 3b5fbd8331 mkbootfs: Fix the default st_mode for root directory.
CL in [1] fixed the wrong mode for the root directory from 0644 to 0755.
However it only handles the path by calling mkbootfs with canned
fs_config (i.e. with -f flag). When calling mkbootfs without -f flag, it
still treats the root directory as a file. This renders the generated
boot/recovery images w/ and w/o -f being different, and leads to the
incorrect checksums in /system/bin/install-recovery.sh.

[1] commit aa8f2f65a030f71506277e2a8d64d83a099e9feb.

Bug: 31988535
Test: `make dist` and verify the checksums in /system/bin/install-recovery.sh.

Change-Id: Ib50fadb23367da0b46944ae0579093da21412593
2016-10-07 16:14:27 -07:00
Josh Gao e335bea277 Merge "adb: rationalize types."
am: 8caf4e7443

Change-Id: I2e363c31a22b57964688f170c6f96cd8764959e0
2016-10-07 20:41:16 +00:00
Treehugger Robot 8caf4e7443 Merge "adb: rationalize types." 2016-10-07 20:35:00 +00:00
Dimitry Ivanov 625484ddfa Revert "Revert "Revert "Revert "Remove liblog from libcutils as a whole static lib""""
This reverts commit 6a452917b3.

Bug: http://b/31289077
Bug: http://b/27171986
Change-Id: Id020fa10c50847bf16a2fcbc7d5e72cf8766b711
2016-10-07 18:43:37 +00:00
Colin Cross faaeda8e12 Merge "libsparse: output_file.c, fix large data chunk issue"
am: 62c9101646

Change-Id: Ica50c8fd851ea2e9ff734253b102b3fa8362577f
2016-10-07 17:20:34 +00:00
Colin Cross 62c9101646 Merge "libsparse: output_file.c, fix large data chunk issue" 2016-10-07 17:17:10 +00:00
John Reck 8e7fa9fb7e Merge "Revert "Revert "Revert "Remove liblog from libcutils as a whole static lib""""
am: b02a355d10

Change-Id: I0d520bbf002a317784ff8bb2963676a98df36706
2016-10-07 16:38:02 +00:00
John Reck b02a355d10 Merge "Revert "Revert "Revert "Remove liblog from libcutils as a whole static lib"""" 2016-10-07 16:32:38 +00:00
John Reck 6a452917b3 Revert "Revert "Revert "Remove liblog from libcutils as a whole static lib"""
This reverts commit 595c1480d0.

Revert reason: broke bullhead-eng build in master

Change-Id: Ie64fc31c3c971366ab9f2543b91b8f5d2040868b
2016-10-07 16:22:38 +00:00
Josh Gao 06d61d4d96 adb: rationalize types.
Use fixed length types for structs going over the wire, constify
arguments where possible, use char* instead of unsigned char* for
apacket data, and assorted other refactoring.

Bug: http://b/29273531
Test: python test_device.py with every combination of old/new adb and adbd
Change-Id: I0b6f818a32be5386985aa4519f542003cf427f9d
2016-10-06 14:50:02 -07:00
Josh Gao 4546c8ac3d Merge "adb: split up adb_auth.cpp."
am: 4a8b178c97

Change-Id: I846a06ca04aad456c6659dd6db4c8d0666fc6707
2016-10-06 19:47:11 +00:00
Treehugger Robot 4a8b178c97 Merge "adb: split up adb_auth.cpp." 2016-10-06 19:37:31 +00:00
Josh Gao 3bd2879d8e adb: split up adb_auth.cpp.
All of the functions in adb_auth.cpp were used in only one of
adb/adbd. Split up them up into adb_auth_host.cpp and adbd_auth.cpp
respectively.

Bug: http://b/29273531
Test: built and flashed bullhead, adb still works
Change-Id: Ib610c5157522634cc273511175152f1306cc52a7
2016-10-06 12:36:26 -07:00
Jeremy Compostella fca594c2de libsparse: output_file.c, fix large data chunk issue
CHUNK_HEADER structure type allows DATA chunk to be up to MAX_UINT
large.

The write() callback LEN parameter should be unsigned int.

Also:
- write() callback should continue to write data if less than expected
  data have been written.
- gzerror() returns LEN on success, 0 otherwise

Test: manual
Change-Id: Id46d664b84c1a506f419524fe28055f784c2ae7a
Signed-off-by: Jeremy Compostella <jeremy.compostella@intel.com>
2016-10-06 09:53:42 -07:00
Dimitry Ivanov e89ec3c4e0 Merge "Revert "Revert "Remove liblog from libcutils as a whole static lib"""
am: 8949696d33

Change-Id: I8099e374eccda844384682256af8d802e3fa0aea
2016-10-06 14:23:25 +00:00
Treehugger Robot 8949696d33 Merge "Revert "Revert "Remove liblog from libcutils as a whole static lib""" 2016-10-06 14:20:41 +00:00
Mark Salyzyn 386630f4ce Merge "logd: report logging memory overhead"
am: d3754ff696

Change-Id: I3e0f11864dab17cc70f0e68a9b69adf8f1edb9d2
2016-10-06 14:19:46 +00:00
Treehugger Robot d3754ff696 Merge "logd: report logging memory overhead" 2016-10-06 14:15:48 +00:00
Dimitry Ivanov 595c1480d0 Revert "Revert "Remove liblog from libcutils as a whole static lib""
This reverts commit f93d732a45.

Bug: http://b/31289077
Bug: http://b/27171986
Change-Id: Ib6e6c0a01296f0a01d98cbf1a9d2659883280d44
2016-10-06 12:47:07 +00:00
Tao Bao a00020317e Merge "adb: Remove the obsolete include path to ext4_utils."
am: 9f828a5383

Change-Id: Ia833226376111a0ead4f0c5b5d79768a8b8dbeb2
2016-10-06 06:23:27 +00:00
Treehugger Robot 9f828a5383 Merge "adb: Remove the obsolete include path to ext4_utils." 2016-10-06 06:18:45 +00:00
Tao Bao fee161d189 adb: Remove the obsolete include path to ext4_utils.
Since commit 8ad80763e4 has removed
'#include "ext4_sb.h"', there's no more reference to ext4_utils headers.

Test: `mmma system/core/adb`

Change-Id: I7ca1a6e91f1e0de84238c2a7facbebe9600a3d87
2016-10-05 18:06:03 -07:00
Mark Salyzyn 9af33ee78c logd: report logging memory overhead
On 64 bit system, calculates to roughly 80 bytes of metadata and
list overhead for each entry.

In unit test example, we report 3388987 bytes of logging data and
overhead total, showmap reports 4652K of dirty data. We still want
to account for the remainder (fragmentation, other sources of
internal allocations etc).

Test: see values and check math
Bug: 31942525
Change-Id: I75f3162ce691faf1ae5a5dec18939fea535ede7e
2016-10-05 15:32:40 -07:00
Andreas Gampe e082ce827d Merge "Base: Hand complete log message to aborter"
am: 0d762648d0

Change-Id: I33dd453e91aa60f3d797d4bd2db53d9ac1599a0b
2016-10-05 20:00:46 +00:00
Treehugger Robot 0d762648d0 Merge "Base: Hand complete log message to aborter" 2016-10-05 19:53:25 +00:00
Elliott Hughes 2e7e065db9 Merge "Test for _WIN32 in instead of USE_MINGW."
am: ec99158580

Change-Id: If3c40977dfa4853a7dc719a9c6904f530ccf3001
2016-10-05 18:33:11 +00:00
Treehugger Robot ec99158580 Merge "Test for _WIN32 in instead of USE_MINGW." 2016-10-05 18:30:06 +00:00
Elliott Hughes 34a4f0b8c7 Test for _WIN32 in instead of USE_MINGW.
Bug: http://b/23392815
Test: builds
Change-Id: I7fce8de1f0e2314170cce456cd49346dcee9d134
2016-10-05 09:37:44 -07:00
Wei Wang 42335b04b4 Merge "Modify log level for service and ueventd"
am: 891d0ba904

Change-Id: Ida9ac705e0f763deb731e3f6ed0ac84933294601
2016-10-05 04:37:47 +00:00
Treehugger Robot 891d0ba904 Merge "Modify log level for service and ueventd" 2016-10-05 04:34:42 +00:00
Andreas Gampe b4e32f3b33 Base: Hand complete log message to aborter
Undo zero-termination-substitution for linebreaks when logging.
This results in handing the complete log message to the aborter.
Add a test.

Bug: 31893081
Test: mmma system/core/base && $ANDROID_HOST_OUT/nativetest64/libbase_test/libbase_test64
Change-Id: I2ef6c6351db2fd494a02985f634f439104136227
2016-10-04 19:19:59 -07:00
Wei Wang a285dac9c0 Modify log level for service and ueventd
Bug: 31938558
Test: flash and take a boot log
Change-Id: I5c6823614e1df760128519dfb294f3a44efa6bac
2016-10-04 14:50:48 -07:00
Mark Salyzyn cb670780be Merge "system/core: drop or replace log/logger.h"
am: 1f90485804

Change-Id: I5b4f756c3a683f2d8e0ebdb79600d4e30bc26849
2016-10-04 18:32:14 +00:00
Mark Salyzyn 1f90485804 Merge "system/core: drop or replace log/logger.h" 2016-10-04 18:27:46 +00:00
Mark Salyzyn 37c9451349 system/core: drop or replace log/logger.h
debuggerd does not require log/logger.h, can use android/log.h
In some cases, mark why log/logger.h was required.

Test: Compile and boot smoke test
Bug: 26552300
Bug: 31289077
Bug: 31456426
Change-Id: Ia34987e25a01d81971ec8d785415f732b8376c4f
2016-10-04 09:09:10 -07:00
Mohan Srinivasan aed39f1f3d Merge "liblog: logd: Add android_lookupEventTag_len()"
am: 093951a230

Change-Id: I2e9a3c1132dc7cd6e22d55cc2983720f7b8510b9
2016-10-03 22:40:19 +00:00
Mohan Srinivasan 093951a230 Merge "liblog: logd: Add android_lookupEventTag_len()" 2016-10-03 22:34:15 +00:00
Dimitry Ivanov 3e5bb6dc6e Merge "Revert "Remove liblog from libcutils as a whole static lib""
am: d4446ccce8

Change-Id: I6bd8c8756d0318ac5b78395bc3c6fdcee11d2ec0
2016-10-03 22:26:06 +00:00
Dimitry Ivanov d4446ccce8 Merge "Revert "Remove liblog from libcutils as a whole static lib"" 2016-10-03 22:21:19 +00:00
Dimitry Ivanov f93d732a45 Revert "Remove liblog from libcutils as a whole static lib"
This reverts commit 6dd58c00ca.

Bug: http://b/31289077
Bug: http://b/27171986
Change-Id: I519d77de118f02346a4f89b197ca4df7e9f883ac
2016-10-03 22:18:49 +00:00
Dimitry Ivanov 7e06b19328 Merge "Remove liblog from libcutils as a whole static lib"
am: dd01f980e5

Change-Id: I9fdba3d75802889ca3f9d9aa4ed7d708023f1e27
2016-10-03 18:37:56 +00:00