Commit Graph

46570 Commits

Author SHA1 Message Date
Yifan Hong 4bb7b18fe1 Merge changes from topic "libprocessgroup_json"
* changes:
  Add schema for task profiles
  Move rootdir/*.json to libprocessgroup
2019-02-20 20:35:47 +00:00
Tom Cherry 4e47753338 Merge "liblog: add stubs variant" 2019-02-20 20:33:36 +00:00
Tom Cherry fe1f701761 liblog: add stubs variant
Ensure that only the symbols in liblog.map.txt can be used by the
platform.

Bug: 123349183
Test: build
Change-Id: I99ae5d0e8ba8f5061ec20701c941d861c9eb615d
2019-02-20 12:32:12 -08:00
Vic Yang 8a4f601c11 Merge "libprocessgroup: Fix memcg path for apps"
am: 1cae1b0f81

Change-Id: Ida2fcf3ab528478f438dc35d583da7e535009ed4
2019-02-20 12:29:11 -08:00
Tom Cherry 0cb6e46c18 Merge "init: Ignore "ro." restrictions when reading prop files"
am: 86f38d56b8

Change-Id: Ia281e928812d45516d857a2d3f37fd62a9e96cc6
2019-02-20 11:30:25 -08:00
Treehugger Robot 14efb903bb Merge "Add the 'unrestricted' config section for vndk_lite devices" 2019-02-20 18:12:27 +00:00
Vic Yang 1cae1b0f81 Merge "libprocessgroup: Fix memcg path for apps" 2019-02-20 17:54:16 +00:00
Julien Desprez fb4c13500f Temporarily @ignore test_reconnect
For the purpose of on-boarding all the other tests,
skip test_reconnect for now.

Test: atest -v adb_integration_test_adb
Bug: 123247844
Change-Id: I50269272adbfc3f946d71bae13677546566d541f
2019-02-20 09:42:49 -08:00
Tom Cherry 86f38d56b8 Merge "init: Ignore "ro." restrictions when reading prop files" 2019-02-20 16:59:39 +00:00
Josh Gao 2eaddf6183 Merge "adbd: log when exiting due to root/unroot/tcpip/usb."
am: de3c3e8c76

Change-Id: I12faec705e93600ad93d1ba90069805b8dd48172
2019-02-20 03:57:53 -08:00
Treehugger Robot de3c3e8c76 Merge "adbd: log when exiting due to root/unroot/tcpip/usb." 2019-02-20 11:40:26 +00:00
Jiyong Park 137e0308b7 Add the 'unrestricted' config section for vndk_lite devices
This is essentially the same change as
bcb5ba75a5
for ld.config.vndk_lite.txt.

Bug: 124789446
Test: atest CtsBionicTestCases on marlin
Change-Id: I6b65ec4df1626d625975c9834bf96ac9ff6cc3f3
2019-02-20 16:43:22 +09:00
Kevin Chyn 65999091ae Merge "Expose libandroidicu to llndk namespace"
am: 4275d9b887

Change-Id: I923c452c153d0b855885ac6a286921c63418feab
2019-02-19 22:48:59 -08:00
Kevin Chyn 4275d9b887 Merge "Expose libandroidicu to llndk namespace" 2019-02-20 06:33:21 +00:00
Victor Chang ff67ef3c7d Expose libandroidicu to llndk namespace
Bug: 124772622
Test: Treehugger
Change-Id: If936eb377c7f0994a9225b8099a672addb2f9ed6
2019-02-20 01:10:06 +00:00
Bowgo Tsai 25ca652133 Merge "Adding GSI fstab entries when needed"
am: 2baecf3c8f

Change-Id: I71824eec82427cf5c4a290e0b919952c7e4e6e76
2019-02-19 16:47:44 -08:00
Treehugger Robot 2baecf3c8f Merge "Adding GSI fstab entries when needed" 2019-02-20 00:36:29 +00:00
Josh Gao 44cac0c1b2 Merge "Hopefully fix more darwin build breakage."
am: b8573e2082

Change-Id: I96d92e896b2921a317c54332ec9a9253156984d4
2019-02-19 14:45:17 -08:00
Josh Gao b8573e2082 Merge "Hopefully fix more darwin build breakage." 2019-02-19 22:38:41 +00:00
Josh Gao d3387380f7 Hopefully fix more darwin build breakage.
Silence narrowing warnings by manually casting to a smaller type,
convert static_asserts to CHECKs, and switch from using MSG_CMSG_CLOEXEC
to manually setting FD_CLOEXEC.

Test: mma
Change-Id: I8aa02804179d754de860279fe34773800b937ab6
2019-02-19 14:37:02 -08:00
Vic Yang ab8d6ab62d libprocessgroup: Fix memcg path for apps
The expected memcg path for apps is
/dev/memcg/apps/uid_<uid>/pid_<pid>.  Right now we are missing the
"apps" component.  Fix it.

Bug: 124776663
Test: Boot on a Go device and does not see error from lmkd anymore.
Change-Id: I0e4c1d8520463fabb171ff4e61479034b6446548
2019-02-19 14:09:00 -08:00
Tom Cherry c031e13664 Merge "load selinux property_contexts in /odm and /product"
am: 7e6dc56b85

Change-Id: I336c4850a1d89de0828ef6dccbc5d902243e2726
2019-02-19 13:55:40 -08:00
Tom Cherry 7e6dc56b85 Merge "load selinux property_contexts in /odm and /product" 2019-02-19 21:34:35 +00:00
Josh Gao dc51803f87 Merge "Fix darwin build break."
am: 3ea374f54c

Change-Id: I5de5658169c27aaa753ffa40e13e3e3bf7b31e03
2019-02-19 13:28:06 -08:00
Josh Gao b1ca42ae28 Merge changes from topic "base_cmsg"
am: 8954d0bc98

Change-Id: If51ace5232566f43430a5fb31708a6b20fc4aba1
2019-02-19 13:27:22 -08:00
Yifan Hong 72ff585bd0 Add schema for task profiles
- Add proto3 files as schema for JSON task profiles / cgroups
  files.

- Add tests to ensure the JSON files (on the device) conforms
  the schema. (libprocessgroup_proto_test)

Test: libprocessgroup_proto_test

Bug: 123664216
Change-Id: I1cab73bd0d3852ff8827fee0be22373da8a6fc5b
2019-02-19 13:26:46 -08:00
Josh Gao 3ea374f54c Merge "Fix darwin build break." 2019-02-19 21:18:46 +00:00
Josh Gao b57dc7a670 Fix darwin build break.
The <malloc.h> include was vestigial from a previous revision.

Test: mma on linux
Change-Id: Iaf8351bec23c2792cefca0e5c9bd42664488f5c4
2019-02-19 13:17:23 -08:00
Josh Gao a80b64f2a0 adbd: log when exiting due to root/unroot/tcpip/usb.
Test: treehugger
Change-Id: Ibfbe4d512c6e126f2e6d311867316f033a4c9ab7
2019-02-19 13:12:59 -08:00
Tom Cherry be0489281f init: Ignore "ro." restrictions when reading prop files
"ro." properties do not make sense for prop files, especially with the
way that the system/product and vendor/odm partitions are meant to
override each other.  To fix this, we ignore the fact that "ro."
properties are "write once" when first loading in property files.

We then adjust the order of property file loading, such that we read
partitions from least to most specific, reading in order: system,
vendor, odm, product, product_services.

Bug: 122864654
Test: ro. properties can override when reading build props with
      appropriate permissions
Test: ro. properties do not override when lacking permissions to
      be set by a given partition
Change-Id: Ib9a5f77e95d9df647cdde7a5c937bb3425c066fa
2019-02-19 13:02:58 -08:00
Josh Gao 8954d0bc98 Merge changes from topic "base_cmsg"
* changes:
  adb: switch to base::{Send,Receive}FileDescriptors.
  debuggerd: switch to base::{Send,Receive}FileDescriptors.
  base: add helpers for sending/receiving file descriptors.
2019-02-19 20:53:01 +00:00
Gavin Corkery 9f6ba484d0 Merge "Rename data/staging to data/pkg_staging."
am: e8510cec19

Change-Id: I60f89ba514adb7336c21660a463c8eb50849affe
2019-02-19 12:25:35 -08:00
Gavin Corkery e8510cec19 Merge "Rename data/staging to data/pkg_staging." 2019-02-19 19:44:13 +00:00
Gavin Corkery 124a4bc791 Rename data/staging to data/pkg_staging.
Test: Build and flash, atest apex_e2e_tests
Fixes: 122999313
Change-Id: I878ee41f804956ee7533d64e844ce98e5a8afacc
Merged-In: I878ee41f804956ee7533d64e844ce98e5a8afacc
2019-02-19 15:46:22 +00:00
vichang 055708f26b Merge changes from topic "dup_icu4c"
am: ce912aadda

Change-Id: Ied6cc731e1c57ab48340b5698c669933ed1ac7d7
2019-02-19 02:28:23 -08:00
Victor Chang 2c75b73688 Remove the public libs in runtime namespace
am: f70a2fe4c1

Change-Id: I7bf3413685b13a10e146319fbdbd176d31afd00d
2019-02-19 02:27:25 -08:00
vichang ce912aadda Merge changes from topic "dup_icu4c"
* changes:
  Linker namespace changes for moving ICU4C to APEX
  Remove the public libs in runtime namespace
2019-02-19 10:14:31 +00:00
Bowgo Tsai 9bbaa7bbee Adding GSI fstab entries when needed
In ReadFstabFromFile(), currently it always adds 'system_gsi' and
'userdata_gsi' fstab entries when running in Live GSI. As the API
might be used to load a fstab file without "/system" and/or "/data",
it's better to replace "/system" with 'system_gsi' and "/data" with
'userdata_gsi', instead of adding 'system_gsi' and 'userdata_gsi'
unconditionally.

Bug: 124640105
Test: boot a Live GSI, then `atest libfs_avb_device_test`

Change-Id: I52928f95b9ebd12ce09ffd538caf96a2de430dbc
2019-02-18 13:27:53 +00:00
Josh Gao dc50e92b71 Merge "adbd: fallback to legacy USB implementation if needed."
am: f80c326d2e

Change-Id: Idf3b8abff8090ef3d4a547db2caec9aa17f8e503
2019-02-16 20:22:43 -08:00
Josh Gao f80c326d2e Merge "adbd: fallback to legacy USB implementation if needed." 2019-02-17 04:14:22 +00:00
Tom Cherry 8f442d5efa Merge "Export init.environ.rc in early-init instead of init"
am: acfb705603

Change-Id: I30a95c806c6694ab3f17996001e0c9668cf2d8e5
2019-02-16 12:09:19 -08:00
Tom Cherry acfb705603 Merge "Export init.environ.rc in early-init instead of init" 2019-02-16 17:53:53 +00:00
Paul Trautrim ba69d077f1 Merge "Add presubmit test for vendor overlay"
am: 024e442812

Change-Id: If101e643188d2d51ca12e2995bfbfde9a369132f
2019-02-16 09:02:19 -08:00
Paul Trautrim 024e442812 Merge "Add presubmit test for vendor overlay" 2019-02-16 16:53:37 +00:00
Jiyong Park 08557e6fa9 Merge "Replace bionic-unit-tests with CtsBionicTestCases"
am: 00c767d177

Change-Id: Ia1c53e7e1b627360456b4fe0ff2f0f9dc846c076
2019-02-15 19:20:04 -08:00
Treehugger Robot 00c767d177 Merge "Replace bionic-unit-tests with CtsBionicTestCases" 2019-02-16 03:12:22 +00:00
Josh Gao 379b6f403f Merge "base: add ScopedLockAssertion."
am: 3777d9cc10

Change-Id: I87de4148215f168aa2d4da566bbbc3fb40699f41
2019-02-15 18:38:17 -08:00
Treehugger Robot 3777d9cc10 Merge "base: add ScopedLockAssertion." 2019-02-16 02:34:32 +00:00
Elliott Hughes c0aa2c18c5 Merge "adf: rename."
am: fd877db2bc

Change-Id: I1b30c965b92286f84c13c56d71770bb79ce981dd
2019-02-15 16:31:33 -08:00
Elliott Hughes 5b4453f27f Merge "liblog: make liblog_headers truly stand-alone."
am: c911d5af6f

Change-Id: I01ba40d48f13275c8c9eef6c9b1e8a0f3d429f5a
2019-02-15 16:26:33 -08:00