Commit Graph

32235 Commits

Author SHA1 Message Date
Steven Moreland 5cc4d19c13 Merge "libcutils: compile with BOARD_VNDK_VERSION current" am: f358bed624 am: dd9a91f109
am: ae4c956012  -s ours

Change-Id: Iae85b41323cad125505b5212de518a7334e13938
2017-04-18 15:06:00 +00:00
Steven Moreland ae4c956012 Merge "libcutils: compile with BOARD_VNDK_VERSION current" am: f358bed624
am: dd9a91f109

Change-Id: I6006b664c42faa2d135e040321e9cd48589e2710
2017-04-18 14:59:54 +00:00
Steven Moreland dd9a91f109 Merge "libcutils: compile with BOARD_VNDK_VERSION current"
am: f358bed624

Change-Id: Idc1ad70ec01687eb23f2eff584751088f122e59f
2017-04-18 14:54:52 +00:00
Treehugger Robot f358bed624 Merge "libcutils: compile with BOARD_VNDK_VERSION current" 2017-04-18 14:46:27 +00:00
Mark Salyzyn ba83d8366c Merge changes Iec369a50,I3f9f8d56,I78959464,I72ea858e am: 6ad16cda19 am: 7b45da1006
am: 732f30ee8e

Change-Id: I2aaac98558b8717c7dc339eccaa3215f40c2575a
2017-04-18 14:33:57 +00:00
Mark Salyzyn 732f30ee8e Merge changes Iec369a50,I3f9f8d56,I78959464,I72ea858e am: 6ad16cda19
am: 7b45da1006

Change-Id: I5969bd70c30e1f4f4e7fbff337a4a1e16ed03176
2017-04-18 14:29:21 +00:00
Mark Salyzyn 7b45da1006 Merge changes Iec369a50,I3f9f8d56,I78959464,I72ea858e
am: 6ad16cda19

Change-Id: I3e44fdd82fb5ec8a1beffa759df82a67556ea16a
2017-04-18 14:23:53 +00:00
Mark Salyzyn 6ad16cda19 Merge changes Iec369a50,I3f9f8d56,I78959464,I72ea858e
* changes:
  logd: instrument tests better for failure
  liblog: log_time add explicit to some constructors.
  logd: iterator corruption paranoia
  logd: regression in handling watermark boundary.
2017-04-18 14:17:12 +00:00
Jiyong Park 9cd5ed710b Merge "linker: don't allow libui to SP-HALs and fix warning" into oc-dev
am: 02012596c1

Change-Id: Ia82a1515e8e47e5a8a39d5fb214ca8a5690efe5e
2017-04-18 01:51:48 +00:00
TreeHugger Robot 02012596c1 Merge "linker: don't allow libui to SP-HALs and fix warning" into oc-dev 2017-04-18 01:30:48 +00:00
Steven Moreland ed08b90e48 Merge "Remove VNDK warning." into oc-dev
am: ca243f2fcb

Change-Id: I19e120f593dc4a6ee7cea76b78a676ee3f71fb70
2017-04-17 23:19:42 +00:00
Steven Moreland fc5d4345fa Merge "libcutils: compile with BOARD_VNDK_VERSION current" into oc-dev
am: 64639fd7dc

Change-Id: Ic30e207a89cf80f6f509f64f92ec9ee32cfaf3c1
2017-04-17 23:19:28 +00:00
Steven Moreland deeb5eb8fb libcutils: vendor_available
am: 9610c548a8

Change-Id: I504b4f52357fa3580e9154291021b57c07bd8b02
2017-04-17 23:19:14 +00:00
Jiyong Park 7b701de5e0 linker: don't allow libui to SP-HALs and fix warning
libui.so is not used by SP-HALs, so it is removed from the list of libs
exposed from the default namespace.

Also, this fixes a warning message "property value is empty" caused by
the automatically removed trailing '/' for the section 'legacy'. Since
the legacy behavior is already implemented by the linker itself, the
behavior doesn't need to specified in ld.config.txt.

Test: marlin/sailfish boots
Test: no warning message is shown
Change-Id: Ib679794d63b01c6794663dc88f1ab7e72cfb11d3
2017-04-18 08:16:03 +09:00
TreeHugger Robot ca243f2fcb Merge "Remove VNDK warning." into oc-dev 2017-04-17 23:07:43 +00:00
TreeHugger Robot 64639fd7dc Merge "libcutils: compile with BOARD_VNDK_VERSION current" into oc-dev 2017-04-17 23:07:38 +00:00
Mark Salyzyn 24aa9a41e1 logd: instrument tests better for failure
Failure to open socket misbehaved and told us nothing.

Test: gTest logd-unit-tests
Bug: 37378309
Change-Id: Iec369a50ccb1027e96947465e90d9572c9f4047f
2017-04-17 15:10:26 -07:00
Mark Salyzyn d87d47f7dd liblog: log_time add explicit to some constructors.
Add explicit to constructors, to prevent implicit conversions.

Test: compile
Bug: 37378309
Change-Id: I3f9f8d561e84c492eafa6528db7c238da072dad8
2017-04-17 15:10:26 -07:00
Mark Salyzyn 3614a0c5d4 logd: iterator corruption paranoia
Add checking for impossible(tm) scenarios within LogBuffer::flushTo:

1) When iterating through the log entries, check if the iterator
   returns two identical element references and break out of the loop.
2) Cap the maximum number of log entries we will skip while holding
   the iterator lock at 4194304, break out of the loop.

We print a message to the kernel logs if we hit these cases.

ToDo: Remove this paranoia at some future date.

Test: gTest liblog-unit-tests logcat-unit-tests and logd-unit-tests
Bug: 37378309
Change-Id: I789594649db14093238828b9f6d1daeca8b780c2
2017-04-17 15:10:26 -07:00
Mark Salyzyn 5836379b21 logd: regression in handling watermark boundary.
Deal with a regression introduced in commit
5a34d6ea43 (logd: drop mSequence from
LogBufferElement) where log_time was compared against nsec() time
miscalculating the watermark boundary.  When dealing with logcat
-t/-T, or any tail reading, add a margin to prune to back off by a
period of 3 seconds (pruneMargin).

Test: gTest liblog-unit-tests logcat-unit-tests and logd-unit-tests
Bug: 37378309
Change-Id: I72ea858e4e7b5fa91741ea84c40d2e7c3c4aa031
2017-04-17 15:10:26 -07:00
Tom Cherry c4b1a2f230 Merge "ueventd: create classes for dev and sys permissions" am: ffa38cfc1e am: e29fa61725
am: b7ef4726ff

Change-Id: I2b64de1007adb68ef3364f0ed6bbd51b297d292e
2017-04-17 21:56:27 +00:00
Tom Cherry b7ef4726ff Merge "ueventd: create classes for dev and sys permissions" am: ffa38cfc1e
am: e29fa61725

Change-Id: Ia0f7ea669fe7ee948b1572fd923fab041cf630c2
2017-04-17 21:46:46 +00:00
Steven Moreland d73be1b96b libcutils: compile with BOARD_VNDK_VERSION current
- moved __android_log_is_debuggable to a new public header
    (log_properties.h)
- vendor version of sched_policy uses ALOG* instead SLOG*

Test: (sanity) liblog-unit-tests
Test: (sanity) libcutils_test (noting b/b/32972117, two tests continue
  to fail)
Test: system/core as a whole makes with BOARD_VNDK_VERSION := current
  now with no problems.
Test: boots/works on internal marlin
Bug: 33241851

(cherry picked from commit 1f83aa424f)

Merged-In: I5bc1f348dc0f0c8814bec5b5c3d2c52c825ab640
Change-Id: I5bc1f348dc0f0c8814bec5b5c3d2c52c825ab640
2017-04-17 14:44:17 -07:00
Tom Cherry e29fa61725 Merge "ueventd: create classes for dev and sys permissions"
am: ffa38cfc1e

Change-Id: Idc3ecf436d5750564de4ba16f0811c1d76cc609d
2017-04-17 21:42:11 +00:00
Tom Cherry ffa38cfc1e Merge "ueventd: create classes for dev and sys permissions" 2017-04-17 21:34:12 +00:00
Steven Moreland 81626e48cb Remove VNDK warning.
Added todo once usages are fixed.

Bug: 33241851
Test: things with -Werror now compile in VNDK
Change-Id: I6c4a148dca4d4710912fe62a8854cb8077651701
2017-04-17 13:48:28 -07:00
Wei Wang c9c66cd486 Merge "init.rc: set initial cpuset to all cores" am: 66f44d823f am: eb9ddd14f1
am: d7652f553c

Change-Id: I1e1fee25ddd8f990dac12712dc1ae1955736f2d8
2017-04-17 20:29:05 +00:00
Wei Wang d7652f553c Merge "init.rc: set initial cpuset to all cores" am: 66f44d823f
am: eb9ddd14f1

Change-Id: I5dce107407c04212e667099d1da0d67f96a6322d
2017-04-17 20:15:43 +00:00
Wei Wang eb9ddd14f1 Merge "init.rc: set initial cpuset to all cores"
am: 66f44d823f

Change-Id: I5caa54781b72126a01171fcf483eca488d90f7b5
2017-04-17 20:10:43 +00:00
Wei Wang 66f44d823f Merge "init.rc: set initial cpuset to all cores" 2017-04-17 20:01:43 +00:00
Chris Fries 45d4eb8dd2 Merge changes from topic '36810152' am: b7826a74f2 am: a14353e664
am: b174f19f24

Change-Id: Ice073716a1a7b0cbbce9d423148ee314d003548e
2017-04-17 19:50:25 +00:00
Chris Fries b174f19f24 Merge changes from topic '36810152' am: b7826a74f2
am: a14353e664

Change-Id: Iae75cb1bf56186a797f0e7a60e62d361c248866a
2017-04-17 19:41:42 +00:00
Steven Moreland 9610c548a8 libcutils: vendor_available
By setting vendor_available, the following may become true:

* a prebuilt library from this release may be used at runtime by
  in a later releasse (by vendor code compiled against this release).
  so this library shouldn't depend on runtime state that may change
  in the future.
* this library may be loaded twice into a single process (potentially
  an old version and a newer version). The symbols will be isolated
  using linker namespaces, but this may break assumptions about 1
  library in 1 process (your singletons will run twice).

Background:

This means that these modules may be built and installed twice --
once for the system partition and once for the vendor partition. The
system version will build just like today, and will be used by the
framework components on /system. The vendor version will build
against a reduced set of exports and libraries -- similar to, but
separate from, the NDK. This means that all your dependencies must
also mark vendor_available.

At runtime, /system binaries will load libraries from /system/lib*,
while /vendor binaries will load libraries from /vendor/lib*. There
are some exceptions in both directions -- bionic(libc,etc) and liblog
are always loaded from /system. And SP-HALs (OpenGL, etc) may load
/vendor code into /system processes, but the dependencies of those
libraries will load from /vendor until it reaches a library that's
always on /system. In the SP-HAL case, if both framework and vendor
libraries depend on a library of the same name, both versions will be
loaded, but they will be isolated from each other.

It's possible to compile differently -- reducing your source files,
exporting different include directories, etc. For details see:

https://android-review.googlesource.com/368372

None of this is enabled unless the device opts into the system/vendor
split with BOARD_VNDK_VERSION := current.

Bug: 36426473
Bug: 36079834
Test: m -j libcutils
Test: attempt to compile with BOARD_VNDK_VERSION := current
Test: (sanity) boot internal marlin
Change-Id: I76f9b28ef08a26d84d1365881e00696cc1dcfe5d
2017-04-17 12:39:26 -07:00
Chris Fries a14353e664 Merge changes from topic '36810152'
am: b7826a74f2

Change-Id: I7ab0cc7268efb9ab6a560c0aa968ec565cac16d0
2017-04-17 19:36:43 +00:00
Tom Cherry cc054c9da8 ueventd: create classes for dev and sys permissions
Create classes for dev and sys permissions and store these permissions
in std::vector instead of the C list.

Test: boot bullhead
Test: init unit tests

Change-Id: I874039a3db29b4c70149506da8e407123ab7eca2
2017-04-17 19:33:04 +00:00
Chris Fries b7826a74f2 Merge changes from topic '36810152'
* changes:
  fastboot: Support larger transfers during flash
  fastboot: Cap max size sent to libsparse
  fastboot: add AdbWinUsbApi as a required module
2017-04-17 19:31:38 +00:00
Steven Moreland 1f83aa424f libcutils: compile with BOARD_VNDK_VERSION current
- moved __android_log_is_debuggable to a new public header
    (log_properties.h)
- vendor version of sched_policy uses ALOG* instead SLOG*

Test: (sanity) liblog-unit-tests
Test: (sanity) libcutils_test (noting b/b/32972117, two tests continue
  to fail)
Test: system/core as a whole makes with BOARD_VNDK_VERSION := current
  now with no problems.
Test: boots/works on internal marlin
Bug: 33241851

Change-Id: I5bc1f348dc0f0c8814bec5b5c3d2c52c825ab640
2017-04-17 12:18:36 -07:00
Keun-young Park 662ef6f866 Merge "check ext4 magic before running next steps" into oc-dev
am: 421067e040

Change-Id: I3f519182d9a8d90a2e426de63480e2ed399502ae
2017-04-17 19:12:10 +00:00
Keun-young Park 421067e040 Merge "check ext4 magic before running next steps" into oc-dev 2017-04-17 19:03:57 +00:00
Chris Fries 0ea946c007 fastboot: Support larger transfers during flash
Adding methods to queue and download flashable images by fd instead of
by pointer, so that we can deal with sending large (up to 4GB) files
on windows and linux.  This gets past limitations on linux to read
more than 2GB from a file at a time, as well as memory limitations
on win32, in order to download up to 4GB in a single transfer.

Test: fastboot -w
Test: "flash-all" from nexus factory images site (incl. fastboot -w update)
Test: fastboot flash with large and small image, large and small max-download-size
Test: Sanity check flashing on win32, darwin, linux.
Test: Sanity check 3GB image download (with 3GB max-download-size)
      on win32, darwin, linux.

Bug: 36810152
Change-Id: I528d739d344eb080d59d721dadf3b3b34d4b375e
2017-04-17 09:22:49 -05:00
Elliott Hughes ee3d0bd23e Merge "Add a README.md about our shell and utilities." am: 75d195693b am: 48f034932b
am: 298ae04ad6

Change-Id: Ifbeb10406ce71e9ed688c2decdb6c1749e56d092
2017-04-15 15:55:53 +00:00
Elliott Hughes 298ae04ad6 Merge "Add a README.md about our shell and utilities." am: 75d195693b
am: 48f034932b

Change-Id: I61380d247f1f5a3cb903bf35932690e293f17a22
2017-04-15 15:43:33 +00:00
Elliott Hughes 48f034932b Merge "Add a README.md about our shell and utilities."
am: 75d195693b

Change-Id: I05279fbc5de92efa6e8a5fb2a51e702b0e1427d5
2017-04-15 15:40:04 +00:00
Treehugger Robot 75d195693b Merge "Add a README.md about our shell and utilities." 2017-04-15 15:33:41 +00:00
Elliott Hughes f90a63474d Merge "Revert "Send property_service AVC messages to the kernel audit system"" into oc-dev
am: 29ab67b0c1

Change-Id: Icbf6c2ac3493464d76bcddf6091cc73c47829beb
2017-04-15 07:40:52 +00:00
TreeHugger Robot 29ab67b0c1 Merge "Revert "Send property_service AVC messages to the kernel audit system"" into oc-dev 2017-04-15 07:37:38 +00:00
Bowgo Tsai 6e69b2ea2a Merge "Set libavb version into system property for Treble OTA" am: e8311491da am: 7b08869382
am: 6f3ec3d759

Change-Id: I2c97b605e75c479e485ac36e1e90c039467df04e
2017-04-15 06:07:10 +00:00
Bowgo Tsai 6f3ec3d759 Merge "Set libavb version into system property for Treble OTA" am: e8311491da
am: 7b08869382

Change-Id: Ic445d12e5fc26a1a534011c7033d79e730538653
2017-04-15 05:55:57 +00:00
Bowgo Tsai 7b08869382 Merge "Set libavb version into system property for Treble OTA"
am: e8311491da

Change-Id: I867972462df8d5830aa520a9d227ca4d8f9f8be2
2017-04-15 05:52:58 +00:00
Bowgo Tsai e8311491da Merge "Set libavb version into system property for Treble OTA" 2017-04-15 05:49:25 +00:00