OSDN Git Service
Dan Willemsen [Mon, 4 Feb 2019 21:39:43 +0000 (13:39 -0800)]
Merge "cppreopts: Move to sh_binary" am:
72598e4766
am:
3882a4328a
Change-Id: Id529ae3da07bed005e8f6359da7c20fa1a479079
Tom Cherry [Mon, 4 Feb 2019 21:39:17 +0000 (13:39 -0800)]
Merge "Move to C++ Fstab class" am:
3978bb74ef
am:
39551ead0e
Change-Id: Icc87a2c4abc65472ff8ea70bce34a24a26edc54c
Dan Willemsen [Mon, 4 Feb 2019 21:35:39 +0000 (13:35 -0800)]
Merge "cppreopts: Move to sh_binary"
am:
72598e4766
Change-Id: Ieb550c133406e953a21310985f01d981b797ee08
Tom Cherry [Mon, 4 Feb 2019 21:35:15 +0000 (13:35 -0800)]
Merge "Move to C++ Fstab class"
am:
3978bb74ef
Change-Id: I4d56702f985ad0d4adb68155c50b31d411c5ece6
Dan Willemsen [Mon, 4 Feb 2019 21:25:34 +0000 (21:25 +0000)]
Merge "cppreopts: Move to sh_binary"
Treehugger Robot [Mon, 4 Feb 2019 21:20:43 +0000 (21:20 +0000)]
Merge "Move to C++ Fstab class"
Tom Cherry [Mon, 4 Feb 2019 19:55:14 +0000 (11:55 -0800)]
Move to C++ Fstab class
Test: treehugger
Change-Id: I6de8debc6756a831b3cdda8767b72c94a318ed9b
Luca Stefani [Sat, 2 Feb 2019 17:53:06 +0000 (18:53 +0100)]
cppreopts: Move to sh_binary
Change-Id: Ie2b1401aa750a1a445daf80b13944a2ca0549c50
Yabin Cui [Fri, 1 Feb 2019 23:39:00 +0000 (15:39 -0800)]
Merge "simpleperf: make atest happy." am:
14638b2b85
am:
0ecc9575a3
Change-Id: Ifa7d123cbbbbc7eba22d34e9f5c6a99db71f5fb6
Yabin Cui [Fri, 1 Feb 2019 23:32:50 +0000 (15:32 -0800)]
Merge "simpleperf: make atest happy."
am:
14638b2b85
Change-Id: I706c9de6d8f0f2d981e2764cba8d031c97bd1180
Yabin Cui [Fri, 1 Feb 2019 23:14:46 +0000 (23:14 +0000)]
Merge "simpleperf: make atest happy."
Yabin Cui [Fri, 1 Feb 2019 23:13:06 +0000 (15:13 -0800)]
simpleperf: make atest happy.
Bug: none
Test: run atest system/extras/simpleperf.
Change-Id: I21d69dcda8293f66e469aa5320099c6bdfa872e5
Yabin Cui [Fri, 1 Feb 2019 00:38:24 +0000 (16:38 -0800)]
Merge "simpleperf: change the way running cts test." am:
7efef0e366
am:
ab53b2afd0
Change-Id: I0e5f01cad990d3808a7c0f7a6aa792e5d36b7ec8
Yabin Cui [Fri, 1 Feb 2019 00:31:46 +0000 (16:31 -0800)]
Merge "simpleperf: change the way running cts test."
am:
7efef0e366
Change-Id: I7a11913e1602f6bcd8e244fa68ef48a99427472c
Treehugger Robot [Fri, 1 Feb 2019 00:20:53 +0000 (00:20 +0000)]
Merge "simpleperf: change the way running cts test."
Yabin Cui [Thu, 31 Jan 2019 23:03:14 +0000 (15:03 -0800)]
Merge "inferno: add --system_wide option." am:
30e7a431c0
am:
b0a5e46f46
Change-Id: I35ae28b289e200141f2c82f2bc06dc69cbe8e573
Yabin Cui [Thu, 31 Jan 2019 22:54:22 +0000 (14:54 -0800)]
Merge "inferno: add --system_wide option."
am:
30e7a431c0
Change-Id: Icbe59924c59a04a96217e8765932de7746e16a35
Yabin Cui [Wed, 30 Jan 2019 01:06:42 +0000 (17:06 -0800)]
simpleperf: change the way running cts test.
To test profiling debuggable apps, simpleperf cts test sets default
app package name for all tests. But it has below problems:
1. It is not explicit in the code of each test, thus harder to maintain.
2. It doesn't profile an app process, thus can't test profiling Java code.
3. Some tests are not suitable to run with app package name and have to
disable app package name manually. This will be true for more tests
if testing profileable apps.
So this CL changes the way running cts tests:
1. Remove default app package name, so all tests by default run in
shell context.
2. Add explict tests to test profiling debuggable apps and profileable
apps.
Bug:
118835348
Test: run CtsSimpleperfTestCases.
Change-Id: I7eacaf0dc66357dbb339a6e6d4c5ca694afa2619
Yabin Cui [Thu, 31 Jan 2019 22:27:29 +0000 (22:27 +0000)]
Merge "inferno: add --system_wide option."
Yabin Cui [Thu, 31 Jan 2019 20:53:16 +0000 (12:53 -0800)]
Merge "simpleperf: fix mac build." am:
79489ecc52
am:
4f9fb69e85
Change-Id: I0ed289fe6c93e607a6d0186ee2d711ed1f11c722
Yabin Cui [Thu, 31 Jan 2019 20:48:28 +0000 (12:48 -0800)]
Merge "simpleperf: fix mac build."
am:
79489ecc52
Change-Id: I5a2bc97b58722fe68bfb0fbf8cde2f8cee6f28bb
Yabin Cui [Thu, 31 Jan 2019 20:27:32 +0000 (20:27 +0000)]
Merge "simpleperf: fix mac build."
Tom Cherry [Thu, 31 Jan 2019 20:06:45 +0000 (12:06 -0800)]
Merge "Add android::fs_mgr namespace for new Fstab code" am:
e85153ee9b
am:
576b7e7d09
Change-Id: Iff6e20af9f03b2518c0771fc57f8c4e3c9f0eeae
Yabin Cui [Thu, 31 Jan 2019 19:52:19 +0000 (11:52 -0800)]
simpleperf: fix mac build.
Bug: none
Test: build simpleperf on mac.
Change-Id: I9d839fc9779321aa5007e745d4aeaba48bb9fc53
Tom Cherry [Thu, 31 Jan 2019 19:51:27 +0000 (11:51 -0800)]
Merge "Add android::fs_mgr namespace for new Fstab code"
am:
e85153ee9b
Change-Id: I1da880787cf5eaf9d4fe7cf3fdefa4626b4f8705
Tom Cherry [Thu, 31 Jan 2019 19:35:54 +0000 (19:35 +0000)]
Merge "Add android::fs_mgr namespace for new Fstab code"
Tom Cherry [Wed, 30 Jan 2019 22:35:10 +0000 (14:35 -0800)]
Add android::fs_mgr namespace for new Fstab code
Test: treehugger
Change-Id: I6ed1afb59eed03ca5a7d06a697ac8b04e74f494d
Yabin Cui [Wed, 30 Jan 2019 21:51:00 +0000 (13:51 -0800)]
Merge "simpleperf: fix mac build." am:
c583d20f1a
am:
27d150feee
Change-Id: I146bc266d7570124bd9423b42e2ecbf39c0f6ed3
Yabin Cui [Wed, 30 Jan 2019 21:32:19 +0000 (13:32 -0800)]
Merge "simpleperf: fix mac build."
am:
c583d20f1a
Change-Id: Ib14fdb106d79b5377fbf639f17abb058ad3fd1c5
Treehugger Robot [Wed, 30 Jan 2019 21:04:13 +0000 (21:04 +0000)]
Merge "simpleperf: fix mac build."
Sandeep Patil [Wed, 30 Jan 2019 19:38:00 +0000 (11:38 -0800)]
Merge "libpagemap: Remove it." am:
91b5f3e204
am:
1f46653f97
Change-Id: I00201b59666310220de68f4a0d8d1120b45a18c2
Sandeep Patil [Wed, 30 Jan 2019 19:32:47 +0000 (11:32 -0800)]
Merge "libpagemap: Remove it."
am:
91b5f3e204
Change-Id: I0dabb4cf67641e5bac4b479448e5715620b0059b
Treehugger Robot [Wed, 30 Jan 2019 19:19:26 +0000 (19:19 +0000)]
Merge "libpagemap: Remove it."
Yabin Cui [Wed, 30 Jan 2019 19:03:40 +0000 (11:03 -0800)]
simpleperf: fix mac build.
Bug: none
Test: build.
Change-Id: I297e8cf9cbd55fd54b64402fd259bfe0b19bffff
Tom Cherry [Wed, 30 Jan 2019 17:51:20 +0000 (09:51 -0800)]
Merge "Move to new Fstab class" am:
fa3bf1fe55
am:
04c9bb5393
Change-Id: Ic6a93cb5f51f0011696beaa022318fb1b50c5976
Tom Cherry [Wed, 30 Jan 2019 17:42:08 +0000 (09:42 -0800)]
Merge "Move to new Fstab class"
am:
fa3bf1fe55
Change-Id: I7c3f234af69c1cfea14e33c545d68bed9a0f03e3
Tom Cherry [Wed, 30 Jan 2019 17:28:08 +0000 (17:28 +0000)]
Merge "Move to new Fstab class"
Tom Cherry [Wed, 30 Jan 2019 01:54:07 +0000 (17:54 -0800)]
Move to new Fstab class
Test: treehugger
Change-Id: I1873022abde51b71b49e8d89bdaada044530987a
Yabin Cui [Wed, 30 Jan 2019 01:29:32 +0000 (17:29 -0800)]
Merge "simpleperf: update test record_cmd.no_dump_symbols." am:
fafccfbbc7
am:
ef3eed05ac
Change-Id: I0746b0df2852338a0870ae13679b2fe4fa574770
Yabin Cui [Wed, 30 Jan 2019 01:25:08 +0000 (17:25 -0800)]
Merge "simpleperf: update test record_cmd.no_dump_symbols."
am:
fafccfbbc7
Change-Id: If4e6c686c3e9df0b9792bac0b3f523063dfcc632
Yabin Cui [Wed, 30 Jan 2019 01:21:21 +0000 (17:21 -0800)]
inferno: add --system_wide option.
Bug:
123587305
Test: run "inferno.sh --system_wide -t 10".
Change-Id: I0240e9a341c9f05298e819e155da426cebd4a810
Yabin Cui [Wed, 30 Jan 2019 01:05:12 +0000 (01:05 +0000)]
Merge "simpleperf: update test record_cmd.no_dump_symbols."
Sandeep Patil [Tue, 29 Jan 2019 21:43:36 +0000 (13:43 -0800)]
libpagemap: Remove it.
Bug:
113035067
Test: lunch aosp_blueline-userdebug; m -j
Change-Id: Id3b99876fea86d9fb74877d7d238241b718fc4dc
Signed-off-by: Sandeep Patil <sspatil@google.com>
Yabin Cui [Fri, 25 Jan 2019 22:15:21 +0000 (14:15 -0800)]
Merge "simpleperf: remove code not in use." am:
58a4d50ece
am:
01b7143d30
Change-Id: I12a2bbaa4f02fefdcb972085992eb48c13f565d7
Yabin Cui [Fri, 25 Jan 2019 22:06:22 +0000 (14:06 -0800)]
Merge "simpleperf: remove code not in use."
am:
58a4d50ece
Change-Id: I7d0379284095a9b1bafd9c390ea90c9b9047939a
Yabin Cui [Fri, 25 Jan 2019 21:48:45 +0000 (21:48 +0000)]
Merge "simpleperf: remove code not in use."
Yabin Cui [Fri, 25 Jan 2019 20:08:02 +0000 (12:08 -0800)]
simpleperf: update test record_cmd.no_dump_symbols.
Bug: none
Test: run simpleperf_unit_test.
Change-Id: I1c068971f5d250603f57a866235e134dfb29e8f2
Yabin Cui [Fri, 25 Jan 2019 18:47:25 +0000 (10:47 -0800)]
simpleperf: remove code not in use.
Bug: none
Test: run simpleperf_unit_test.
Change-Id: I012e84713988adba83cb5ce81e809e792eff27c3
Yabin Cui [Fri, 25 Jan 2019 18:51:57 +0000 (10:51 -0800)]
Merge "simpleperf: move to Android.bp." am:
d1b35b7603
am:
c595bd5046
Change-Id: Idbcf44a13a5b4375b6cd5362e69aa039072d1b51
Yabin Cui [Fri, 25 Jan 2019 18:46:51 +0000 (10:46 -0800)]
Merge "simpleperf: move to Android.bp."
am:
d1b35b7603
Change-Id: Ibb5b8ca58f4eb76d635d164532334a4a506130d4
Yabin Cui [Fri, 25 Jan 2019 18:39:49 +0000 (18:39 +0000)]
Merge "simpleperf: move to Android.bp."
Hridya Valsaraju [Fri, 25 Jan 2019 17:09:43 +0000 (09:09 -0800)]
Merge "boot_signer should support boot header version 2" am:
92cf0ef128
am:
3bbf2f460d
Change-Id: I710fe113693232a019d7a56795f047d26dba493b
Hridya Valsaraju [Fri, 25 Jan 2019 17:04:32 +0000 (09:04 -0800)]
Merge "boot_signer should support boot header version 2"
am:
92cf0ef128
Change-Id: I7944c69bd99c637b6623185e4fd112b8d03e9c25
Treehugger Robot [Fri, 25 Jan 2019 16:56:26 +0000 (16:56 +0000)]
Merge "boot_signer should support boot header version 2"
Hridya Valsaraju [Fri, 25 Jan 2019 02:38:07 +0000 (18:38 -0800)]
boot_signer should support boot header version 2
Boot Image header version two modifies the boot image
format to include DTB.
Test: make
Bug:
111136242
Change-Id: Icfc1fce695d0e19ff15a1d74afd00b9b88cccf7e
Yabin Cui [Tue, 22 Jan 2019 18:54:13 +0000 (10:54 -0800)]
simpleperf: move to Android.bp.
Bug:
72403367
Test: build
Test: run simpleperf_unit_test.
Test: run CtsSimpleperfTestCases.
Change-Id: I384189a7f58b65a22f0916d51a7d3a2a45cafa82
Yabin Cui [Thu, 24 Jan 2019 20:58:31 +0000 (12:58 -0800)]
Merge "Remove direct dependency on the internal libdexfile library." am:
829754ce78
am:
1c696b84ee
Change-Id: Ie85086f3bab55512288fcbdf31a6a6e85637bf56
Yabin Cui [Thu, 24 Jan 2019 20:40:52 +0000 (12:40 -0800)]
Merge "Remove direct dependency on the internal libdexfile library."
am:
829754ce78
Change-Id: Id52bcd9b8ff6cd4005445dba4afe5af3dd4e103d
Yabin Cui [Thu, 24 Jan 2019 20:07:52 +0000 (20:07 +0000)]
Merge "Remove direct dependency on the internal libdexfile library."
Yabin Cui [Thu, 24 Jan 2019 19:18:06 +0000 (11:18 -0800)]
Merge "simpleperf: Use simpleperf_app_runner to profile profileable apps." am:
3ce0d80876
am:
5c5d694396
Change-Id: I265ede607a2a0675c84d19455cfe880d12d5be51
Yabin Cui [Thu, 24 Jan 2019 19:05:38 +0000 (11:05 -0800)]
Merge "simpleperf: Use simpleperf_app_runner to profile profileable apps."
am:
3ce0d80876
Change-Id: Ide3320df4f92cae64e1f929bbedb1bbbe76f8da5
Yabin Cui [Thu, 24 Jan 2019 18:39:13 +0000 (18:39 +0000)]
Merge "simpleperf: Use simpleperf_app_runner to profile profileable apps."
Martin Stjernholm [Thu, 24 Jan 2019 15:38:49 +0000 (15:38 +0000)]
Remove direct dependency on the internal libdexfile library.
It breaks Runtime APEX packaging, and for shared libs it's pulled in
indirectly through libdexfile_external anyway.
Test: mmma system/extras/simpleperf
Bug:
119632407
Bug:
72403367
Change-Id: Ie5a130280b3c36190d0a9778873b17e256d7a0a5
Yabin Cui [Thu, 10 Jan 2019 23:35:39 +0000 (15:35 -0800)]
simpleperf: Use simpleperf_app_runner to profile profileable apps.
Simpleperf uses run-as to run in apps' context to profile debuggable
apps. In Android Q, we want to profile <profileable shell="true"> apps.
To support that, do below changes:
1. Add simpleperf_app_runner, which is similar to run-as, but is limited
to only run simpleperf commands in profileable apps.
2. Add code using simpleperf_app_runner inside simpleperf, so it doesn't
change current interface of using simpleperf.
Bug:
118835348
Test: run simpleperf manually.
Test: run simpleperf_unit_test.
Change-Id: I85a8e3c80fe0e3ccdee97de38be968cbccd1d263
Sandeep Patil [Tue, 22 Jan 2019 16:13:58 +0000 (08:13 -0800)]
Merge "system/extras: Delete ksmutils" am:
918f046c39
am:
30757a5b0f
Change-Id: I3fe1b5953bdd75084f50479b4783bef461a70b28
Sandeep Patil [Tue, 22 Jan 2019 16:09:55 +0000 (08:09 -0800)]
Merge "system/extras: Delete ksmutils"
am:
918f046c39
Change-Id: I757d594f6c1fd61b2b2fb9de8075024b4941fd4e
Treehugger Robot [Tue, 22 Jan 2019 15:58:51 +0000 (15:58 +0000)]
Merge "system/extras: Delete ksmutils"
Leo Liou [Tue, 22 Jan 2019 06:55:03 +0000 (22:55 -0800)]
Merge "ext4.h: add EXT4_FEATURE_RO_COMPAT_VERITY" am:
5c1d920237
am:
36c1d31465
Change-Id: Ia874120efcc8aeffcf66594ae6f69a6aaee257a5
Leo Liou [Tue, 22 Jan 2019 06:50:47 +0000 (22:50 -0800)]
Merge "ext4.h: add EXT4_FEATURE_RO_COMPAT_VERITY"
am:
5c1d920237
Change-Id: Ifae740c7a51555f511dceba483f3e9eaf0686290
Treehugger Robot [Tue, 22 Jan 2019 06:39:59 +0000 (06:39 +0000)]
Merge "ext4.h: add EXT4_FEATURE_RO_COMPAT_VERITY"
Leo Liou [Tue, 15 Jan 2019 12:28:12 +0000 (20:28 +0800)]
ext4.h: add EXT4_FEATURE_RO_COMPAT_VERITY
Add VERITY constant to ext4_utils.
Bug:
117437571
Test: bootable for phone projects
Change-Id: I77cab3594223df860345266fdbf568c02734c1a8
Sandeep Patil [Mon, 21 Jan 2019 22:37:35 +0000 (14:37 -0800)]
system/extras: Delete ksmutils
We want to remove libpagemap. ksmutils is the only C code that needs it
right now. Remove it instead of doing the C++ rewrite, cause it's not
worth it since we don't even recommend enabling ksm for Android anymore.
Bug:
111694435
Test: none
Change-Id: I4c4e82d9febecb3103660ff5dbe1adb7b3bc3452
Signed-off-by: Sandeep Patil <sspatil@google.com>
Sandeep Patil [Mon, 21 Jan 2019 21:47:33 +0000 (13:47 -0800)]
Merge "pagemap/tools: remove all pagemap based tools" am:
7857e3c56a
am:
e9afccf0d9
Change-Id: Id9007aa876053edb94cd5a4c7cb52e39e89145c2
Sandeep Patil [Mon, 21 Jan 2019 21:44:28 +0000 (13:44 -0800)]
Merge "pagemap/tools: remove all pagemap based tools"
am:
7857e3c56a
Change-Id: I771162d5d4babbb4aa821e8a0eaa8da43388843d
Treehugger Robot [Mon, 21 Jan 2019 21:35:18 +0000 (21:35 +0000)]
Merge "pagemap/tools: remove all pagemap based tools"
Sandeep Patil [Sat, 19 Jan 2019 20:22:36 +0000 (12:22 -0800)]
pagemap/tools: remove all pagemap based tools
Bug:
111694435
Test: builds
Test: showmap and procrank exist on userdebug builds.
Change-Id: I3fb63d3adeedd7dece843cbc38e1667f4309bfd3
Signed-off-by: Sandeep Patil <sspatil@google.com>
Dan Willemsen [Sat, 19 Jan 2019 08:07:10 +0000 (00:07 -0800)]
Merge "Remove LOCAL_MODULE_TAGS := debug" am:
48f6b916e9
am:
58d3b4aad7
Change-Id: I992f9edec86ab46be4e575a8c1432c34084916bc
Dan Willemsen [Sat, 19 Jan 2019 07:50:22 +0000 (23:50 -0800)]
Merge "Remove LOCAL_MODULE_TAGS := debug"
am:
48f6b916e9
Change-Id: I809aa4fc70d2791c1922a260d73fc48391647ff1
Dan Willemsen [Sat, 19 Jan 2019 07:39:56 +0000 (07:39 +0000)]
Merge "Remove LOCAL_MODULE_TAGS := debug"
Dan Willemsen [Fri, 18 Jan 2019 23:19:56 +0000 (15:19 -0800)]
Remove LOCAL_MODULE_TAGS := debug
Instead, su has been added to PRODUCT_PACKAGES_DEBUG in
build/make/target/product/base_system.mk
memeater didn't appear to have anything that needed it in every eng
build, so I've just removed the tag. If it's necessary, add it to the
list above.
I removed LOCAL_MODULE_TAGS and LOCAL_MODULE_PATH from libsimpleperf, as
static libraries are not impacted by either setting.
Test: treehugger
Change-Id: Iec2610bdb4452f955b0baf5d817e99a2ebf15594
Yabin Cui [Fri, 18 Jan 2019 20:57:58 +0000 (12:57 -0800)]
Merge "simpleperf: split simpleperf build on target." am:
16cbcf371a
am:
a448c5a90f
Change-Id: I5a7b84d0a07bd36fe37ac7579749d9b1e76c30ed
Yabin Cui [Fri, 18 Jan 2019 20:52:39 +0000 (12:52 -0800)]
Merge "simpleperf: split simpleperf build on target."
am:
16cbcf371a
Change-Id: I3fa72f9b1200721024e23fb4ef82059c7784ab94
Yabin Cui [Fri, 18 Jan 2019 20:43:53 +0000 (20:43 +0000)]
Merge "simpleperf: split simpleperf build on target."
Patrick Shi [Fri, 18 Jan 2019 04:52:46 +0000 (20:52 -0800)]
Merge "simpleperf: add SC7731E into whitelist, omit tests requiring hw counters." am:
3fccf4e8ce
am:
54f7dc51e3
Change-Id: I544e8b902fbfef66091892fd6f0ce4f1d531aab8
Patrick Shi [Fri, 18 Jan 2019 04:48:27 +0000 (20:48 -0800)]
Merge "simpleperf: add SC7731E into whitelist, omit tests requiring hw counters."
am:
3fccf4e8ce
Change-Id: I79fd801254f82df3899c2b84ff690cad9b6b0279
Treehugger Robot [Fri, 18 Jan 2019 04:33:22 +0000 (04:33 +0000)]
Merge "simpleperf: add SC7731E into whitelist, omit tests requiring hw counters."
Patrick Shi [Thu, 17 Jan 2019 16:00:28 +0000 (00:00 +0800)]
simpleperf: add SC7731E into whitelist, omit tests requiring hw counters.
Some Socs like SC7731E PMU will not be available when
disable jtag(non-invasive debug), so omit tests requiring
hw counters on them.
Issue:
122291303
Test: run cts -m CtsSimpleperfTestCases -t record_cmd#generate_samples_by_hw_counters
Test: hw counters.
Change-Id: I321011dd9d1feab43a3491820579f5633904c45a
Yabin Cui [Thu, 17 Jan 2019 23:10:51 +0000 (15:10 -0800)]
simpleperf: split simpleperf build on target.
Currently simpleperf on target builds static binary, shipped on
userdebug devices and in ndk release. Now split it into two builds.
Simpleperf shipped on device uses shared libs and version lib.
Simpleperf shipped in ndk release is renamed to simpleperf_static.
This is to ship simpleperf on Q user device.
Also change the directory of simpleperf from /system/xbin to
/system/bin.
Bug:
118835348
Bug:
72403367
Test: build and run simpleperf manually.
Change-Id: I25b861fc24fdf2edfeb432050303aaec293a005f
Xin Li [Thu, 17 Jan 2019 22:05:59 +0000 (14:05 -0800)]
[automerger skipped] Merge "DO NOT MERGE - Skip pie-platform-release (PPRL.190105.001) in master" am:
8a1ca53619 -s ours
am:
b9809603c1 -s ours
am skip reason: subject contains skip directive
Change-Id: I2d1891ddc877bd7b643a459595fa49fa1e7bb6ca
Xin Li [Thu, 17 Jan 2019 21:53:54 +0000 (13:53 -0800)]
[automerger skipped] Merge "DO NOT MERGE - Skip pie-platform-release (PPRL.190105.001) in master"
am:
8a1ca53619 -s ours
am skip reason: subject contains skip directive
Change-Id: I6429db54e09c995948d42d327605ec24d1774d85
Xin Li [Thu, 17 Jan 2019 21:19:42 +0000 (21:19 +0000)]
Merge "DO NOT MERGE - Skip pie-platform-release (PPRL.190105.001) in master"
Martijn Coenen [Wed, 16 Jan 2019 07:41:37 +0000 (23:41 -0800)]
Merge "Add /data/staging to directories that shouldn't be encrypted." am:
a70a1872eb
am:
360f05bc4e
Change-Id: I2b467612e01cce5e694f418b9b82515a07222b42
Martijn Coenen [Wed, 16 Jan 2019 07:36:34 +0000 (23:36 -0800)]
Merge "Add /data/staging to directories that shouldn't be encrypted."
am:
a70a1872eb
Change-Id: I7acca92f0e7ba25c8b84ebdc8c915a726b13c483
Martijn Coenen [Wed, 16 Jan 2019 07:30:44 +0000 (07:30 +0000)]
Merge "Add /data/staging to directories that shouldn't be encrypted."
Yabin Cui [Wed, 16 Jan 2019 00:48:23 +0000 (16:48 -0800)]
Merge "Migrate system/extras to androidx.test" am:
37fb5e52bb
am:
7dd56279a3
Change-Id: I1eb9eb1d9cd8a093da560258ac1e4da22df681d5
Yabin Cui [Wed, 16 Jan 2019 00:42:25 +0000 (16:42 -0800)]
Merge "Migrate system/extras to androidx.test"
am:
37fb5e52bb
Change-Id: I478628b001e0a9d1b683885a0b8fba0c21adfb72
Yabin Cui [Wed, 16 Jan 2019 00:27:36 +0000 (00:27 +0000)]
Merge "Migrate system/extras to androidx.test"
Martijn Coenen [Tue, 15 Jan 2019 22:42:40 +0000 (23:42 +0100)]
Add /data/staging to directories that shouldn't be encrypted.
/data/staging contains downloaded APEX files, no user data.
Bug:
122884909
Test: WIP
Change-Id: Idc17cd8978a7c432a65eb1bb4775fa88e87d2b8f
Xin Li [Tue, 15 Jan 2019 18:18:58 +0000 (10:18 -0800)]
DO NOT MERGE - Skip pie-platform-release (PPRL.190105.001) in master
Bug:
122685541
Change-Id: Iefc29a8f9bcfb053db8f6c260029000744a5687e
Xin Li [Tue, 15 Jan 2019 02:19:39 +0000 (18:19 -0800)]
[automerger skipped] DO NOT MERGE - Skip pie-platform-release (PPRL.190105.001) into stage-aosp-master
am:
942632faf9 -s ours
am skip reason: subject contains skip directive
Change-Id: Ic229e48e37bca2a99514a29c9e3f8b1651d1ae50
OSDN Git Service
