aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Split *_product makefiles"HEADmasterTreehugger Robot2019-01-1617-43/+144
|\
| * Split *_product makefilesSzuWei Lin2019-01-1617-43/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So far, we have *_system.mk and *_vendor.mk. This patch split all product settings from *_vendor.mk to new *_product.mk This patch also create a new telephony.mk to include all telephony_*.mk Bug: 119747870 Test: lunch mainline_arm64-user; make -j Test: compare the content with and without the patch Test: the output files in out folder are the same Change-Id: I79aefdd1971b3b5724a3ec858de4109b645c765a Merged-In: I79aefdd1971b3b5724a3ec858de4109b645c765a
* | Merge "Remove webview from media_system.mk"Anton Hansson2019-01-161-1/+0
|\ \
| * | Remove webview from media_system.mkAnton Hansson2019-01-151-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | It is present in media_vendor.mk (and soon media_product.mk), which is the correct place. Test: make Change-Id: I7ffda211cf4b01a22ec01c661959defcf59bbc4b
* | | Merge "Execute appcompat for apps built from soong"Treehugger Robot2019-01-161-1/+22
|\ \ \
| * | | Execute appcompat for apps built from soongJeongik Cha2019-01-151-1/+22
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Appcompat runs for app defined in Android.mk, but not in Android.bp So make appcompat run for app from soong(Android.bp) Bug: 110073830 Bug: 122026042 Test: m out/target/product/$(get_build_var TARGET_DEVICE)/appcompat.zip Change-Id: I73832410ec5850222b04086c2a377146886ba035
* | | Merge "Revert "Simplify soong_java_prebuilt.mk and soong_app_prebuilt.mk""Colin Cross2019-01-152-59/+61
|\ \ \
| * | | Revert "Simplify soong_java_prebuilt.mk and soong_app_prebuilt.mk"Colin Cross2019-01-152-59/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a76cc6d732431ebb2ceddaf87445aedd548d1623. Reason for revert: broke emma turbine build Change-Id: Ie894565501d0de44f96dc736408a8c4e2ba2ed90
* | | | Merge "Simplify soong_java_prebuilt.mk and soong_app_prebuilt.mk"Colin Cross2019-01-152-61/+59
|\| | |
| * | | Simplify soong_java_prebuilt.mk and soong_app_prebuilt.mkColin Cross2019-01-152-61/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify importing Soong modules into Make by always copying LOCAL_PREBUILT_MODULE_FILE to LOCAL_BUILT_MODULE, which lets Soong pick the final output file instead of trying to figure out which of the various intermediate files should be the output file. Also fixes an issue where hostdex modules could attempt to copy to both $(common_javalib.jar) and $(LOCAL_BUILT_MODULE), which are the same file for host java modules. Test: set compile_dex:true on core.platform.api.stubs. no warnings of target overriding Test: m checkbuild Change-Id: Id84d499a0869961be5a906d8472b75b9c843b4b4
* | | | Merge "Enable execute-only memory layouts by default."Ivan Lozano2019-01-152-2/+2
|\ \ \ \
| * | | | Enable execute-only memory layouts by default.Ivan Lozano2019-01-152-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This enables execute-only memory (XOM) layouts to be used by default in the build system. As of now, there's only support for ARM64 devices, so this only affects those. Since userland XOM requires kernel support, devices without the necessary support will continue to allow pages marked execute-only to be read and they should be unaffected by this. Bug: 77958880 Test: Device with and without kernel support boot. Test: Binary throws segfault when reading from XOM on supported device. Test: Debugger works and stack traces are still generated correctly. Test: Teamfooding, stable during regular usage. Change-Id: I8db4235c8e60eea6d701bdf3c43b79a06d6b01cd
* | | | | Merge "Add gsid"Treehugger Robot2019-01-151-0/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add gsidHoward Chen2019-01-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The gsid is a daemon for managing GSI. Bug: 122556707 Test: make && ls ${OUT}/bin/gsid Change-Id: Ib4a3e95a7e232236ee1255a156043e45a77a3c8e
* | | | | Merge changes I6457933a,I955aa0faMark Salyzyn2019-01-151-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Revert "Relax inode usage estimation slack for DAP right sizing" Revert "Increase slack for inode estimation algorithm"
| * | | | | Revert "Relax inode usage estimation slack for DAP right sizing"Mark Salyzyn2019-01-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit bd17fab26048d9469fd6d857517d77a81e9b1d74. Test: build Bug: 122328872 Change-Id: I6457933a0dc51827bd86d9c55b02a65999612bcc
| * | | | | Revert "Increase slack for inode estimation algorithm"Hridya Valsaraju2019-01-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e8e7958c13a18c1a381fe7ac0f4df36a80ef05ad. Test: build Bug: 122328872 Change-Id: I955aa0fa489ab62ec1643127d106925dcb9675ca
* | | | | | Merge "Fix typo in some comments"Treehugger Robot2019-01-151-2/+2
|\ \ \ \ \ \
| * | | | | | Fix typo in some commentsJiyong Park2019-01-151-2/+2
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | Test: no need Change-Id: I68620689f1a2eb2eca67e11b55dc781e7744859e
* | | | | | Merge "Stop using the `files` target for droidcore"Dan Willemsen2019-01-152-3/+4
|\ \ \ \ \ \
| * | | | | | Stop using the `files` target for droidcoreDan Willemsen2019-01-142-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This way if a BoardConfig.mk configures a specific image to exist (so it doesn't end up as a folder on /system), but does not configure for it to be created (like the device targets on AOSP that use a prebuilt), we won't unnecessarily trigger the build system to build the contents. Test: `m` before and after, comparing file lists Test: check treehugger builds before/after Change-Id: If0e4b958b3dfaa02771a5da70f970379635f904e
* | | | | | | Merge "Revert "Add core-simple to the standard boot classpath""Neil Fuller2019-01-152-2/+1
|\ \ \ \ \ \ \
| * | | | | | | Revert "Add core-simple to the standard boot classpath"Neil Fuller2019-01-142-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e85777782a56ff8feb7f2c06a552a3e017511b55. Bug: 119301609 Test: build Change-Id: Ibf9f9f56a6027a4cc3f3ea5a34b3dee748ad83c2
* | | | | | | | Merge "Error if a Soong module attempts to install a classes jar"Treehugger Robot2019-01-151-0/+5
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | / / | | |_|_|_|/ / | |/| | | | |
| * | | | | | Error if a Soong module attempts to install a classes jarColin Cross2019-01-141-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only dex jars should be installed, make it an error to not provide a dex jar for an device installable java module. Bug: 122831369 Test: m checkbuild Change-Id: I99c5738e6053fbaa3dd22406f50b7a002555702c
* | | | | | | Merge "ATest: Add test config template for python."Treehugger Robot2019-01-151-0/+21
|\ \ \ \ \ \ \
| * | | | | | | ATest: Add test config template for python.yelinhsieh2018-11-201-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug:118442443 Test: NA Change-Id: Id285afd7331d9e99eb5ff211cf394a572fe6e694
* | | | | | | | Merge "Add IBluetoothAudio HAL 2.0 to VNDK"Treehugger Robot2019-01-141-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Add IBluetoothAudio HAL 2.0 to VNDKCheney Ni2019-01-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 111519504 Test: build & boot Change-Id: I4247b67709a68f26c670371e6a3407171988dcf4 Merged-In: I4247b67709a68f26c670371e6a3407171988dcf4 (cherry picked from commit b7e100c6be19b111381c0fa45a201f5f7cf3128b)
* | | | | | | | | Merge "Remove myself from OWNER file"Nan Zhang2019-01-141-2/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Remove myself from OWNER fileNan Zhang2019-01-141-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: N/A Change-Id: I6d8b253c1333c27c6a059581e280b8b3c222efc1
* | | | | | | | | Merge "Add viewcompiler to device"Treehugger Robot2019-01-141-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add viewcompiler to deviceEric Holk2019-01-141-0/+1
| | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed so that we can generate precompiled layouts at app install time. Bug: 111895153 Change-Id: Ia2905fdcecc1517e6ae2c8dd4317e3a41ebee107
* | | | | | | | | Merge "Use find(1)'s -exec directly."Elliott Hughes2019-01-141-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use find(1)'s -exec directly.Elliott Hughes2019-01-141-1/+1
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | toybox xargs doesnt have --no-run-if-empty: xargs: Unknown option no-run-if-empty (see "xargs --help") But we shouldn't need it anyway. Test: make -j32 showcommands dist TARGET_BUILD_APPS='Launcher3 Launcher3Tests' EMMA_INSTRUMENT_STATIC=true TARGET_BUILD_VARIANT=userdebug Change-Id: I72f680c27b58a42b9fb9de1a0bc4187cabcfb516
* | | | | | | | | Merge "releasetools: OutputFile stages files under input dir."Treehugger Robot2019-01-141-24/+29
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | releasetools: OutputFile stages files under input dir.Tao Bao2019-01-141-24/+29
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We used to create the intermediate output file as a tempfile, when adding images to a given zip file. This CL changes OutputFile to write intermediate files under the given input dir (i.e. OPTIONS.input_tmp that holds the unzipped files), if the final destination is a zip archive. This allows image building codes finding the generated images at consistent locations. The intermediate files will be cleaned up as part of OPTIONS.input_tmp. Bug: 122608028 Test: `m dist` Test: Delete OTA/super*.img from a target_files.zip. Run `add_img_to_target_files.py -a` that re-generates split super images. Change-Id: I97903a59fcc0ca5e43bb9b07c3a0b25e9baa92f9
* | | | | | | | Merge "No longer honor `DONT_INCLUDE_RUNTIME_APEX`."Roland Levillain2019-01-141-3/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | No longer honor `DONT_INCLUDE_RUNTIME_APEX`.Roland Levillain2019-01-141-3/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Android Runtime APEX is always included on all products. Test: make systemimage on marlin-userdebug Test: make systemimage on sailfish-userdebug Bug: 113373927 Change-Id: I47b02ee44562b8da17bd960825a3489572018d93
* | | | | | | Merge "Remove conscrypt from boot image."Nicolas Geoffray2019-01-143-3/+6
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Remove conscrypt from boot image.Vladimir Marko2019-01-113-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | But keep it as part of the boot class path and deliver the dex files uncompressed in /system/framework/conscrypt.jar. Test: Pixel 2 XL boots. Bug: 119868597 Change-Id: I41b96a586401d120998be5a111331935030922c6
* | | | | | | Merge "Make get-file-size compatible with toybox stat"Treehugger Robot2019-01-121-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Make get-file-size compatible with toybox statLuca Stefani2019-01-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Use the same format as mk_qemu_image.sh Change-Id: I5df23f488006440075a00798a171f7a8856e097a
* | | | | | | | Merge "Rename ANS to ONS"Sooraj Sasindran2019-01-121-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Rename ANS to ONSSooraj Sasindran2019-01-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename ANS to ONS Bug: 118347827 Test: compile Merged-In: Id01f0fc595e736f081d97309f62426cc54ac9e94 Change-Id: Id01f0fc595e736f081d97309f62426cc54ac9e94
* | | | | | | | Merge "Fix possible incremental build issue"Treehugger Robot2019-01-121-0/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix possible incremental build issueDan Willemsen2019-01-111-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We tried to start using toybox's sed, but it produced invalid results with one of init's genrules. Clear out that generated code to fix future incremental builds, since we don't rebuild everything on a $PATH change. Bug: 122744241 Test: generate bad file, remove toybox sed, apply this change Change-Id: I197aa4b68b2fe309b3033e8736e1d80c8ded80ad
* | | | | | | | | Merge "Fix size check for devices with multiple groups"Treehugger Robot2019-01-111-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix size check for devices with multiple groupsYifan Hong2019-01-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old code calls check-sum-of-partition-sizes within a foreach loop, causing syntax error: ... fi partition_size_list=... Add a semicolon after fi to fix this. Test: build with multiple groups, each group with a partition in it Change-Id: Ic4387408f3efc1744871619c300546765c678a61
* | | | | | | | | | Merge "Update acloud alias to support mac via workaround in go/acloud-mac."Treehugger Robot2019-01-111-0/+2
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |