summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-06-11release-request-276f9f52-87fd-4915-bd79-9a2f0ee77433-for-git_oc-release-4090 ↵android-security-8.0.0_r54android-security-8.0.0_r53android-security-8.0.0_r52android-cts-8.0_r1android-8.0.0_r9android-8.0.0_r7android-8.0.0_r51android-8.0.0_r50android-8.0.0_r49android-8.0.0_r48android-8.0.0_r47android-8.0.0_r46android-8.0.0_r45android-8.0.0_r44android-8.0.0_r43android-8.0.0_r42android-8.0.0_r41android-8.0.0_r40android-8.0.0_r4android-8.0.0_r39android-8.0.0_r38android-8.0.0_r37android-8.0.0_r36android-8.0.0_r35android-8.0.0_r32android-8.0.0_r31android-8.0.0_r30android-8.0.0_r3android-8.0.0_r29android-8.0.0_r28android-8.0.0_r2android-8.0.0_r17android-8.0.0_r16android-8.0.0_r15android-8.0.0_r13android-8.0.0_r12android-8.0.0_r11android-8.0.0_r10android-8.0.0_r1security-oc-releaseoreo-security-releaseoreo-releaseoreo-r6-releaseoreo-r5-releaseoreo-r4-releaseoreo-r3-releaseoreo-r2-releaseandroid-build-team Robot
213 snap-temp-L31600000073091223 Change-Id: Iaec40d95adb7f45a2838320b29845192e398c39d
2017-06-08Fix macOS buildandroid-vts-8.0_r1oreo-devRomain Guy
Bug: 34719251 Test: compile Change-Id: I97e93313f9b6ab7e8a753d4035b7805b21fdfa2d (cherry picked from commit b86fd88966aa15c2b9cce1bf0f7907fcdd11134e)
2017-06-07Merge ↵android-build-team Robot
"release-request-0ddf2eab-ecaa-4014-951f-9236b1e43859-for-git_oc-release-4075595 snap-temp-L43000000071370789" into oc-release
2017-06-07release-request-224b654d-e3ad-4f05-a95d-d10d1516b3f6-for-git_oc-release-4075 ↵android-build-team Robot
622 snap-temp-L17600000071371496 Change-Id: Ied0e0626ed5748303c1cdff559597702e8fc09f8
2017-06-07release-request-0ddf2eab-ecaa-4014-951f-9236b1e43859-for-git_oc-release-4075 ↵android-build-team Robot
595 snap-temp-L43000000071370789 Change-Id: I77f4e1bfdd4e5ba4c0fd63fa6e9ecdd1953983f6
2017-06-05add component metadata tag to CTS kernel config test casesGuang Zhu
Bug: 36140955 Bug: 35360169 Test: new unit test to ensure that all modules have this field Change-Id: I1478559f4aeb8d16e7ef0a1bc65fec6644fe3c65 Merged-In: I60cdfb77e7c20615fde43612cc77b0b6846612fa
2017-05-31release-request-49d3fda6-f7aa-4b8d-aeeb-eed9adb96e3c-for-git_oc-release-4053 ↵android-build-team Robot
943 snap-temp-L63500000069017893 Change-Id: I95c94cf10007a76680003c9147d7095e3c135990
2017-05-31Mark libpagemap vendor_available.Jayant Chowdhary
libpagemap is a library which belongs to vndk-cap. Mark it vendor_available to enable vndk abi stability checks on it. Details: https://android-review.googlesource.com/368372 Test: mm -j64 Bug: 38244611 Merged-In: I5c0f31840eef558b2aa7b65cb24370a696306105 Change-Id: I310d0a4d8dd9e87615c276bd66639170b2a70648 (cherry picked from commit 37212881797146ff95b49d252ed0e576d14a7fdb)
2017-05-09merge in oc-release history after reset to oc-devgitbuildkicker
2017-05-08Fix wrong usage of * in find commandPo Hu
When KATI_FIND_EMULATOR is disabled, the following warning message will appear: find: paths must precede expression: build_id.h Usage: find [-H] [-L] [-P] [-Olevel] [-D help|tree|search|stat|rates|opt|exec] [path...] [expression] Because the * in 'find some/path -name *' command is wrongly expanded by shell. We should change * to "*". Change-Id: Ib051f47bb9335930944b8f63fd0fb54fbb867f31 Merged-In: Ib051f47bb9335930944b8f63fd0fb54fbb867f31 Test: make KATI_EMULATE_FIND=false (cherry picked from 4432b6f3f41d3169c4759799722cf226adf5b579) Bug: 37553659
2017-04-18merge in oc-release history after reset to oc-devgitbuildkicker
2017-04-14ext4_utils: update default conf from e2fsprogsJin Qian
Build server machines are using a conf file optimized for google data center. We should use the default version from upstream e2fsprogs. Keep reserved_ratio at 1% to get more free space. Bug: 37361511 Change-Id: I2638df72cfd3b9404981ef227651d38025a8053c
2017-04-05merge in oc-release history after reset to oc-devgitbuildkicker
2017-04-04ext4_utils: define keyctl_unlink()Eric Biggers
This will allow vold to unlink keys rather than revoking them. This also removes the keyctl_revoke() definition for now, to discourage any further (mis)use in the context of ext4 encryption. Bug: 35988361 Change-Id: Ic94329040f77ffbe2415287fe1202fa61e8a006b (cherry picked from commit 3f062383deb3e5ba7b16d4728f5dbc44f40bc178)
2017-04-04Merge "ext4_utils: add default mke2fs.conf" into oc-devJin Qian
2017-04-04ext4_utils: add default mke2fs.confJin Qian
Copy default configs from borg build machine and enable ext_attr. Bug: 34947454 Test: make systemimage Change-Id: I011b3d119f35beb0e78b804e62deff229775a0b0 (cherry picked from commit 87eb12642f68f5a8594893618cfab128da82ebd8)
2017-04-04Fix cts alsr failure.Dan Cashman
/data/nativetest is not present on user builds, so remove tests depending on that from CTS inclusion. Bug: 36888825 Bug: 36484285 Test: cts builds and runs (test no longer present) Change-Id: I7134a1dca6df03fdfa9c0cc7488abd4570a95e33
2017-04-04merge in oc-release history after reset to oc-devgitbuildkicker
2017-04-03Merge "Removed e4crypt_create_device_key" into oc-devTom Cherry
2017-04-02merge in oc-release history after reset to oc-devgitbuildkicker
2017-03-31Removed e4crypt_create_device_keyJanis Danisevskis
Init was the only user of e4crypt_create_device_key and it is not using it any more. Bug: 36278706 Test: Removed unused code, and codebase still builds. (cherry picked from commit d151a583479f475fcfb5d016d7d39dadec97ee72) Change-Id: I5033dc5d315ea6be84fa9d286615c94a057dc1f0
2017-03-31Switch to fs_mgr_read_fstab("/fstab.device")Bowgo Tsai
fstab.device is for backward compatibility in legacy devices. As it doesn't have fstab entries in device tree (for early mount) so we can just use the ordinary fs_mgr_read_fstab(). For new devices having early mount, it should use fs_mgr_read_fstab_default() instead. Bug: 35811655 Test: boot sailfish Change-Id: I70b64787e600d6e338e57f2a31bad188a39d433d (cherry picked from commit 732b20936d9875c06fab847b7f7e255859e7859f)
2017-03-29os-release.d: Add system_id.Sen Jiang
This is the app id of the SoM stored in the system. Test: adb shell cat /etc/os-release.d/system_id Change-Id: Iba7ac028ffa7402f06fbf9c4a3a077eb3414940e (cherry picked from commit d41148b6c8d59d4f35711028248fc644428ddc57)
2017-03-29merge in oc-release history after reset to oc-devgitbuildkicker
2017-03-29merge in oc-release history after reset to ↵gitbuildkicker
f52d1400d6b473cb6716b94705f416fbfbdcccae
2017-03-29merge in oc-release history after reset to oc-devgitbuildkicker
2017-03-28Merge "Fix the linking error due to libminui change" am: 5e9cc93acaTianjie Xu
am: d5d88e29d2 Change-Id: I855f99a87ace1c509fd8c0d3edc260cdad7257cf (cherry picked from commit 8a5ec8ef99deefb361c37982a3783b04b9ed22ee)
2017-03-26merge in oc-release history after reset to mastergitbuildkicker
2017-03-25Merge "ext4_utils: fix crash when filesystem size is too small" am: ↵Jin Qian
7902acdaa0 am: d57a607ac7 am: 4814dc5fa7 Change-Id: I8459f1a3dbdc2bbb84a86f4376d3e2c59239862a
2017-03-25Merge "ext4_utils: fix crash when filesystem size is too small" am: 7902acdaa0Jin Qian
am: d57a607ac7 Change-Id: I6857786fde370caf9c7ea10202e90b8e945d6627
2017-03-25Merge "ext4_utils: fix crash when filesystem size is too small"Jin Qian
am: 7902acdaa0 Change-Id: Ieb83a45f469eeca6a17cacd1d211b5d3c7fedd15
2017-03-25Merge "ext4_utils: fix crash when filesystem size is too small"Treehugger Robot
2017-03-25ext4_utils: fix crash when filesystem size is too smallJin Qian
make_ext4fs crashes if size is less than block size or less than header size (super block + descriptors + bitmaps). Check the size and return errors. Test: run make_ext4fs with small sizes Bug: 36576677 Change-Id: I61d92e280cdf290054fadda5a045fc839c6fd8fe
2017-03-23merge in oc-release history after reset to mastergitbuildkicker
2017-03-22merge in oc-release history after reset to mastergitbuildkicker
2017-03-22merge in oc-release history after reset to ↵gitbuildkicker
a4ab044e18a7fc3e27ca87e4f90d66a5b0c02722
2017-03-22Merge "simpleperf: update simpleperf prebuilts to build 3839284." am: ↵Yabin Cui
91ddc60836 am: 3c996df3b9 am: 159bf30d33 Change-Id: I551a8d13c655858487dbdbbc0889897a2950c3f1
2017-03-22Merge "simpleperf: update simpleperf prebuilts to build 3839284." am: 91ddc60836Yabin Cui
am: 3c996df3b9 Change-Id: I93d5ec056cb3fcef495afa4e2670861714911867
2017-03-22Merge "simpleperf: update simpleperf prebuilts to build 3839284."Yabin Cui
am: 91ddc60836 Change-Id: Ieea7cf96db623a47488e139d338e2207a1fa3a2f
2017-03-22Merge "simpleperf: update simpleperf prebuilts to build 3839284."Treehugger Robot
2017-03-22simpleperf: update simpleperf prebuilts to build 3839284.Yabin Cui
Taken from branch aosp-master. And remove update.py from the distribution. Bug: http://b/35726123 Test: run pprof_proto_generator.py. Change-Id: I9b8e0c2f804c5e61ef1c9b1eb1aa626d0d849f64
2017-03-22merge in oc-release history after reset to mastergitbuildkicker
2017-03-22Merge "simpleperf: add new scripts in sdk artifacts." am: 955ffc9f09 am: ↵Yabin Cui
d4d6e0c95d am: 7a3f05a456 Change-Id: I6895f3f2e61f5922240a039662a8ea3534cdb447
2017-03-22Merge "simpleperf: add new scripts in sdk artifacts." am: 955ffc9f09Yabin Cui
am: d4d6e0c95d Change-Id: Ic8f2ed68e863d56a447892657b28687b347c35c2
2017-03-22Merge "simpleperf: add new scripts in sdk artifacts."Yabin Cui
am: 955ffc9f09 Change-Id: I602c1c414bd2abd30a01a50bb45059cfa74b757d
2017-03-21Merge "simpleperf: add new scripts in sdk artifacts."Treehugger Robot
2017-03-21simpleperf: add new scripts in sdk artifacts.Yabin Cui
Bug: http://b/35726123 Test: run `make sdk -j30`. Change-Id: I1515afc0d69dbbcc3756b7d93b738039a1174571
2017-03-21Merge "simpleperf: add script to generate proto data used by pprof." am: ↵Yabin Cui
94892d4ead am: 50c4ddad23 am: 3fe89fa08d Change-Id: If852bc8fac920ff9b1b87fefeb7909589a0ee5dd
2017-03-21Merge "simpleperf: add script to generate proto data used by pprof." am: ↵Yabin Cui
94892d4ead am: 50c4ddad23 Change-Id: I4bcd5796e144063454d63632eaf43879ce859748
2017-03-21Merge "simpleperf: add script to generate proto data used by pprof."Yabin Cui
am: 94892d4ead Change-Id: I73afb3476a3cef47b9e9a88556745f07362f44d9