summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-03-04Merge "Put product_id and product_version to OEM partition."android-o-preview-1o-previewAlex Deymo
2017-03-02Put product_id and product_version to OEM partition.Sen Jiang
Also create symlinks for each entry in /etc/os-release.d to its corresponding location in /oem/os-release.d. Test: m installclean && m droid oem_image dist Bug: 32555385 Bug: 33211225 Bug: 35804180 (cherry picked from commit 8de8ac139aa289f22f5326af2805a64c0b6bd410) (cherry picked from commit 4c6f2be8720829eaf8681bcf584f1064e735fa7c)
2017-02-26Merge "Remove references to kernel macros."Christopher Ferris
2017-02-25Merge "simpleperf: fix a small error."Treehugger Robot
2017-02-24simpleperf: fix a small error.Yabin Cui
Test: run binary_cache_builder.py. Change-Id: I78b16b012bba641f82b33b936c94a1acd5bdf275
2017-02-24Remove references to kernel macros.Christopher Ferris
The macros __force, __bitwise, __user are related to a kernel tool called sparse to find kernel bugs. These macros are always defined as nothing in the current uapi kernel header files, so these don't need to be here. Change-Id: Ia29b0ddbe80298dc19b170c927f1910e14af2c6b Test: Builds without warnings/errors.
2017-02-24Merge "simpleperf: generate one report for each event attr."Treehugger Robot
2017-02-24Merge "simpleperf: add --raw-period option for report cmd."Treehugger Robot
2017-02-23simpleperf: add --raw-period option for report cmd.Yabin Cui
Bug: http://b/35475170 Test: run simpleperf_unit_test. Change-Id: Ib5bae0b775ac2a3e647b7724df01ce0b8deb1a38
2017-02-23simpleperf: generate one report for each event attr.Yabin Cui
Bug: http://b/35475170 Test: run simpleperf_unit_test. Test: run report.py. Change-Id: Ie9329a64c701bce38f7b440c16cb47e99e83db45
2017-02-23Merge "simpleperf: build libsimpleperf_inplace_sampler library."Yabin Cui
2017-02-23Merge "Use interfaceDescriptor instead of interfaceChain"Treehugger Robot
2017-02-22Use interfaceDescriptor instead of interfaceChainYifan Hong
wherever suits. Sementically, interfaceDescriptor returns the first element of interfaceChain; use interfaceDescriptor when the rest of the elements aren't used. Bug: 34136228 Test: pass Change-Id: Icc78e7e9b17b7c51c705c20d51c2fbac5b1c5dd7
2017-02-21Merge "Remove external/openssl/include from verity include path."Treehugger Robot
2017-02-21Merge "bootctl: Return<T> is non-copyable."Yifan Hong
2017-02-19Remove external/openssl/include from verity include path.Elliott Hughes
Bug: N/A Test: builds Change-Id: I7f13cd6c3edcff436676e93ca305e07ba6a92b08
2017-02-17bootctl: Return<T> is non-copyable.Yifan Hong
By copying the Return<T> in handl_return, the original Return<T> object is left status unchecked when it is destroyed. Test: compiles Change-Id: I7bf21370e8323374deb9a8d3f252e9742357f000
2017-02-15Merge "simpleperf: build cts test running in app context."Yabin Cui
2017-02-15Merge "fix potential leak of memory pointed."Treehugger Robot
2017-02-15simpleperf: build cts test running in app context.Yabin Cui
When built for cts test, the test binary uses run-as to move itself to the data directory of debuggable app 'com.android.simpleperf', and run the tests in app context using run-as. Bug: http://b/18790309 Test: run cts-tradefed, 'run everything -m CtsSimpleperfTestCase'. Change-Id: I523470bb8062cb944b44dc6f264a8b1c14221b62
2017-02-10simpleperf: build libsimpleperf_inplace_sampler library.Yabin Cui
libsimpleperf_inplace_sampler.so is a library linked with user's app. It opens a unix socket server and waits for simpleperf's profiling request. This patch doesn't contain code generating real samples, instead it uses a fake sample for testing. Add runtest for 32bit. Increase runtest duration to 2 seconds and adjust some args in runtest.conf to make test result stable. Fix one tiny error in cmd_report.cpp to report correctly in `report --sort comm,symbol`. Bug: http://b/30974760 Test: run simpleperf_unit_test. Test: run runtest.py. Change-Id: I58163fe47f62e6ba7dd684b33a2ce302feb880f5
2017-02-10Merge "simpleperf: fix an error in checking monitored targets."Yabin Cui
2017-02-10simpleperf: fix an error in checking monitored targets.Yabin Cui
Bug: http://b/30974760 Test: run simpleperf_unit_test. Change-Id: Ib3b5772468f0d67f54859d7dff15f66b567fac95
2017-02-10Merge "SquashFS whitelist support."Daniel Rosenberg
2017-02-10Merge "ext4_utils: allow passing flash block sizes to make_ext4fs_sparse ↵Connor O'Brien
functions"
2017-02-08SquashFS whitelist support.Mohan Srinivasan
Support for specifying a (whole file) whitelist to mksquashfs, so that frequently read in files will not be compressed. Bug: 28605313 Signed-off-by: Mohan Srinivasan <srmohan@google.com> Change-Id: I07c848266ed656b7df3daf7f0e3569f5c9012280
2017-02-07fix potential leak of memory pointed.Yunlian Jiang
This fixes the warning warning: Potential leak of memory pointed to by field 'bench' Bug: None Test: The warning is gone. Change-Id: Ief00a2f040b0a9700040e1c13856f24e3e7c817d
2017-02-06ext4_utils: allow passing flash block sizes to make_ext4fs_sparse functionsConnor O'Brien
Add versions of make_ext4fs_sparse_fd() and make_ext4fs_sparse_fd_directory() that accept flash erase & logical block size as arguments. Refactor to avoid copied code in the new aligned versions of each function. Test: Pass block sizes to new functions using fastboot -w and check that the new userdata has the correct stride and stripe-width values. Bug: 33243520 Signed-off-by: Connor O'Brien <connoro@google.com> Change-Id: I16da6e0ce699439c53d1a722c6d56eb3f9cd9bc5
2017-02-04Merge "simpleperf: add inplace-sampler event type."Yabin Cui
2017-02-03simpleperf: add inplace-sampler event type.Yabin Cui
Add inplace-sampler event type, so it can be used in record/list command. This cl doesn't add code for communicating with profiled process, and fake records in InplaceSamplerClient.cpp for testing purpose. Refactor runtest.py to test inplace-sampler profiling. Bug: http://b/30974760 Test: run runtest.py --inplace-sampler. Change-Id: I92d8b03583c58b3589207f5c655e03853899be3a
2017-02-03Merge "Add permission bits to open with O_CREAT."Treehugger Robot
2017-02-03Merge "Fix clang static analyzer warnings."Treehugger Robot
2017-01-31Add permission bits to open with O_CREAT.George Burgess IV
It's an error to pass open O_CREAT without giving it mode bits: https://linux.die.net/man/3/open Given that we never seem to do anything with the file but delete it, 0600 seems fine. Bug: 32073964 Test: Now builds with clang FORTIFY. Change-Id: Ia68463144b32475a470d39530a1fcaa0b52825ca
2017-01-28Merge "Add libbase dependency for recovery_test/boot_control_copy"Treehugger Robot
2017-01-27Add libbase dependency for recovery_test/boot_control_copybowgotsai
It requires libbase due to fs_mgr is using <android-base/logging.h> Bug: 34336098 Test: compile Change-Id: I120a8f6c7e7bf052081e8c97a358384665927088
2017-01-26Merge "Use LOCAL_TEST_DATA for test data"Colin Cross
2017-01-26Merge "Do not add macro min() definition for C++"Treehugger Robot
2017-01-25Merge "Convert several libraries to soong."Alex Deymo
2017-01-25Merge "ext4_utils: Change to base/logging in ext4_crypt_init_extensions"Treehugger Robot
2017-01-25Do not add macro min() definition for C++bowgotsai
It will have build error when the caller also includes <algorithm> in C++: external/libcxx/include/__undef_min_max: macro min is incompatible with C++ Bug: 34336098 Test: builds Change-Id: I984a24a8dfce6da5a1ad52594ef94ed97c67e9b8
2017-01-25Merge "Allow passing flash block sizes to libext4_utils"Treehugger Robot
2017-01-24Allow passing flash block sizes to libext4_utilsConnor O'Brien
Flash erase & logical block size can be used to tune the stride and stripe_width parameters. Add make_ext4fs_directory_align, which takes these sizes as arguments. Test: Factory reset marlin, confirm userdata params are set correctly Bug: 33243520 Change-Id: Ic8343cff221f0e203a463370a4f1be5ee191946d Signed-off-by: Connor O'Brien <connoro@google.com>
2017-01-25Merge "slideshow: Track the minui callback API change."Tao Bao
2017-01-24Convert several libraries to soong.Alex Deymo
This patch coverts libfec and its dependencies to soong. This also updates the name of the libext2_uuid-host library removing the "-host" suffix as that is also being converted to soong. Also create a shared library for libfec given that it has quite a few dependencies. Bug: 34284069 Test: mmma system/extras; make checkbuild Change-Id: Ib3ada6420bae32418a02ca92db664d0d24214e2f
2017-01-24Merge "Add instrumentation test support to app_profiler.py"Chris Craik
2017-01-24Merge "Add gitignore for pyc files"Treehugger Robot
2017-01-23Add instrumentation test support to app_profiler.pyChris Craik
Bug: 32834638 Test: manual runs of app_profiler.py Change-Id: I9bd3741ffed4f765ddc4cdb7cf56f0772f87ffcb
2017-01-23Add gitignore for pyc filesChris Craik
Test: manual - ran app_profiler.py Change-Id: I2f6b78bd7ed1200af4fe66a3fcaa8a08ef261576
2017-01-23Merge "bootctrl HAL uses "default" service name"Chris Phoenix
2017-01-23Merge "simpleperf: profile non-debuggable apps on rooted devices."Yabin Cui