Commit Graph

34270 Commits

Author SHA1 Message Date
Nicolas Geoffray
3293557187 Merge "Introduce a whitelist for core apps used by system server."
am: 679727afeb

Change-Id: I631f5c67a09d5dc466f6200392ca3528589e16ad
2017-04-28 11:38:29 +00:00
Nicolas Geoffray
679727afeb Merge "Introduce a whitelist for core apps used by system server." 2017-04-28 11:32:52 +00:00
Nicolas Geoffray
b08ada1daa Introduce a whitelist for core apps used by system server.
And by default 'speed' compile those apps at build time.

bug:33799337
Test: m -j32

(cherry picked from commit 9af483488a)

Change-Id: I66f1c675369fccc03b6529c08cb030264d15ba1c
2017-04-28 10:38:41 +01:00
Yueyao Zhu
143b2be93e Merge "Makefile: support build and avb signing of dtbo img"
am: 1a752acc89

Change-Id: I9b3fbff10331e4cd01aa43d22641b60b0f2f4374
2017-04-28 02:12:18 +00:00
Treehugger Robot
1a752acc89 Merge "Makefile: support build and avb signing of dtbo img" 2017-04-28 02:03:43 +00:00
Chih-Hung Hsieh
5bc24ca63a Merge "Get Android TOP from build.log file."
am: 72a662a282

Change-Id: I6308b936d3e9ac3d532bc3dac818a38dce03a61f
2017-04-27 22:51:05 +00:00
Treehugger Robot
72a662a282 Merge "Get Android TOP from build.log file." 2017-04-27 22:36:23 +00:00
Yueyao Zhu
211c90158c Makefile: support build and avb signing of dtbo img
Test: make with corresponding configurations in BoardConfig.mk
- dtbo.img is copied to the OUT directory
- avbtool info_image --image dtbo.img shows avb hashes
- avbtool info_image --image vbmeta.img shows dtbo partition info

Bug: 37730955
Change-Id: If3edaab860926c743f18fd031c911b076eb09fab
2017-04-27 14:49:39 -07:00
Chih-Hung Hsieh
ef21d1458b Get Android TOP from build.log file.
find_android_root works only when warn.py is found
so it works for build bot, but not when warn.py is
run against a stand alone build.log file.
Now get the TOP directory path from build.log
if it is found.

Bug: 37725427
Test: warn.py --gencsv build.log
Change-Id: I7b776c2e71a8d8d769f0600b08abe37acbd6ce7c
2017-04-27 10:25:37 -07:00
Tao Bao
5e15d3cce1 Merge "Revert "Revert "Add compatibility metadata to OTA package"""
am: f9937b5c24

Change-Id: I1673c92ae8985e8ef681ea91a89ff237232be931
2017-04-27 16:21:40 +00:00
Tao Bao
f9937b5c24 Merge "Revert "Revert "Add compatibility metadata to OTA package""" 2017-04-27 16:12:57 +00:00
Mark Salyzyn
151e856015 Merge "fs_config_dirs and fs_config_files miscalculates LOCAL_REQUIRED_MODULES"
am: d0020fafe2

Change-Id: I9af881f708c619e9da5b7b5204bbd58dd52d6195
2017-04-27 15:39:35 +00:00
Mark Salyzyn
d0020fafe2 Merge "fs_config_dirs and fs_config_files miscalculates LOCAL_REQUIRED_MODULES" 2017-04-27 15:33:29 +00:00
Mark Salyzyn
eb8dc72724 fs_config_dirs and fs_config_files miscalculates LOCAL_REQUIRED_MODULES
Misspelled fs_config_generate_extra_partition_list when used to
calculate LOCAL_REQUIRED_MODULES dependencies.  This resulted in
fs_config_dirs and fs_config_files failing to generate the vendor,
oem or odm variants (ie: fs_config_files_vendor)

Test: build generates correct fs_config override files.
Bug: 37721445
Bug: 36071012
Change-Id: I053dd5cdb357c7cea05a5ff63b0686bd0bc99df6
2017-04-27 08:01:27 -07:00
Nicolas Geoffray
39568a6783 Merge "Update build files to new compiler filters."
am: 6c8c20dd5b

Change-Id: I01c7d2d2500d1d5c64cf8f1ed9d2901309ca9edd
2017-04-27 11:49:44 +00:00
Nicolas Geoffray
6c8c20dd5b Merge "Update build files to new compiler filters." 2017-04-27 11:40:07 +00:00
Tao Bao
21803d3574 Revert "Revert "Add compatibility metadata to OTA package""
This reverts commit b1e59b8a73.

This CL enables generating compatibility zip entry in an A/B OTA
package. We're not enabling the support for non-A/B OTAs for now until
they have the necessary support (e.g. /proc/config.gz exists).

Bug: 36810913
Test: Generate full and incremental packages for marlin and applly under
      normal boot and sideload respectively.

Change-Id: I69f0a3feb7a0efc7f727f92f31c9e63f47ee6530
(cherry picked from commit b63c952cc7)
2017-04-26 14:28:46 -07:00
Mark Salyzyn
b6650076ad Merge changes I44289a3d,I0537453b,I23a655b1
am: 7928afb83d

Change-Id: I9d9b429bb855e0051bfb26ddc01453c7221fce23
2017-04-26 14:41:59 +00:00
Mark Salyzyn
7928afb83d Merge changes I44289a3d,I0537453b,I23a655b1
* changes:
  fs_config_generator: Add fs_config_(dirs|files)_(vendor|oem|odm)
  fs_config_generate: add -P <partitionlist> option
  fs_config_generate: unit test
2017-04-26 14:36:43 +00:00
Narayan Kamath
ba8e91ded3 Merge "Update stale comment for dalvik.vm.stack-trace-file."
am: 5b50433f19

Change-Id: I52e974e8fba0d4a7d546ed30cf0099b60f589afc
2017-04-26 08:30:00 +00:00
Narayan Kamath
5b50433f19 Merge "Update stale comment for dalvik.vm.stack-trace-file." 2017-04-26 08:23:49 +00:00
Mark Salyzyn
1fd588cfb2 fs_config_generator: Add fs_config_(dirs|files)_(vendor|oem|odm)
Add build targets to generate the vendor, oem and odm slices of the
fs_config_dirs and fs_config_files targets for each of the respective
filesystems, and automatically trigger the individual and enabled
partition build objects based as dependents of fs_config_dirs and
fs_config_files.

Sensitive to the following board definition pairs:

BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE  BOARD_USES_VENDORIMAGE
BOARD_OEMIMAGE_FILE_SYSTEM_TYPE     BOARD_USES_OEMIMAGE
BOARD_ODMIMAGE_FILE_SYSTEM_TYPE     BOARD_USES_ODMIMAGE

Which when defined and set means the images are generated for vendor,
oem or odm respectively.

Test: manually build w/ m 'fs_config_(dirs|files)_(vendor|oem|odm)'
      and check the expected products, or fails if not pertinent.
Test: build for product that produces split to system and vendor and
      subsequently boots with vendor products correctly configured.
Bug: 36071012
Change-Id: I44289a3dd50b7657367c826ad813c671a3de6afc
2017-04-25 15:09:09 -07:00
Mark Salyzyn
256d339413 fs_config_generate: add -P <partitionlist> option
Add a -P option to fs_config_generate that allows us to filter on
a comma separated partition whitelist or minus prefixed -blacklist.
A partition is defined as accessible as <partition>/ or
system/<partition>/.

No change for legacy, where no -P flag is specified.

For system.img, but not vendor, oem or odm file references:
fs_config_generate -P -vendor,-oem,-odm

For vendor.img file references:
fs_config_generate -P vendor

For oem.img file references:
fs_config_generate -P oem

For odm.img file references:
fs_config_generate -P odm

Add and fortify tests for each of these cases.

SideEffects: none
Test: gTest host fs_config-unit-test
Bug: 36071012
Change-Id: I0537453bb289d41ef98ad76e69f78ae49358a1b3
2017-04-25 15:09:01 -07:00
Mark Salyzyn
5649b31a17 fs_config_generate: unit test
Test -D and -F flag of fs_config_generate

Test: gTest host fs_config-unit-tests
Bug: 36071012
Change-Id: I23a655b17b7c55817f2aacc760700ff1b0728db3
2017-04-25 15:08:56 -07:00
Jiyong Park
7423f3ab11 Merge "Embed jni libs in vendor apks for treble-ized devices"
am: 5aada52ffb

Change-Id: I10902684187e4b6db4f8a8ec3921d19c07edf13c
2017-04-25 21:15:14 +00:00
Treehugger Robot
5aada52ffb Merge "Embed jni libs in vendor apks for treble-ized devices" 2017-04-25 21:06:35 +00:00
Vikas Marwaha
d7214ec091 Merge "Added make files for variable Nougat MR1"
am: b27fb9f528

Change-Id: I769d1c1058cc629d5fcb8008669f6cf11caafd33
2017-04-25 20:23:39 +00:00
Vikas Marwaha
b27fb9f528 Merge "Added make files for variable Nougat MR1" 2017-04-25 20:15:44 +00:00
George Burgess IV
2f6f02d812 Merge "warn.py: have URLs open in new tabs"
am: 7ffb8c8fa8

Change-Id: I34c7c05cae50f7696be969c87d781c1a5ff7df54
2017-04-25 17:12:25 +00:00
Treehugger Robot
7ffb8c8fa8 Merge "warn.py: have URLs open in new tabs" 2017-04-25 17:05:09 +00:00
Narayan Kamath
d5068605f9 Update stale comment for dalvik.vm.stack-trace-file.
Test: make
Change-Id: Ia14494b146f58937aed203271be340747817519b
2017-04-25 15:41:04 +01:00
Nicolas Geoffray
0576b5f24e Update build files to new compiler filters.
bug:34715556
Test: build and boot aosp bullhead
Change-Id: I95c7bbabd68a58206e8c79a017337a7f9a518569
2017-04-25 12:25:33 +01:00
Simran Basi
1543b1a3e5 Merge "base_rules.mk : Support subconfigs for testcases."
am: f1ec8ac22d

Change-Id: I398f45e37fef34ef3bd1e766133a9de2333e4d6a
2017-04-24 21:07:36 +00:00
Treehugger Robot
f1ec8ac22d Merge "base_rules.mk : Support subconfigs for testcases." 2017-04-24 20:54:28 +00:00
Simran Basi
3e73e2bca6 base_rules.mk : Support subconfigs for testcases.
Updates the test module build rules to also copy over any
extra test configs that match the naming convention of
LOCAL_MODULE_*.config

Bug: 37315907
Test: forrest test HelloWorldTests_HalloWelt
Change-Id: Ie476285fe780cb19264f1fb0294008b21893a4ed
2017-04-24 11:43:36 -07:00
Jiyong Park
1cb8dea625 Embed jni libs in vendor apks for treble-ized devices
JNI libs used by bundled APKs have been installed outside of the APK
(e.g. /system/lib and /vendor/lib) to save space because multiple APKs
may share the same set of JNI libs.

However, this causes problem for treble-ized devices where access to
/vendor/lib is prohibited for system processes including Java apps.

So, the JNI libs are embedded into the APK when the APK is installed to
/vendor partition and the device is fully treble-ized.

Bug: 37491282
Test: Move an APK and its JNI libraries to vendor partition by setting
LOCAL_PROPRIETARY_MODULE := true and build:
The jni lib does not exist under /system or /vendor. unzipping
the apk reveals the jni lib under ./lib/<abi> directory.

Change-Id: I8389761dfbd28d181869d79f0bf988a1e4df2fca
2017-04-24 10:01:34 +09:00
George Burgess IV
169f5f1c6c warn.py: have URLs open in new tabs
Bug: None
Test: Ran warn.py on a build log. Code links in resultant HTML open in
new tabs when clicked.

Change-Id: Ia3def5ea14fe216700cb2ffabe4a39b98e69d55a
2017-04-21 15:19:36 -07:00
Jiyong Park
e56c17d779 Merge "make libprotobuf-cpp-* libs VNDK"
am: cd46573189

Change-Id: I2504dae4a287bc4ac1269229dca1cf7e4902c037
2017-04-21 07:50:59 +00:00
Treehugger Robot
cd46573189 Merge "make libprotobuf-cpp-* libs VNDK" 2017-04-21 07:46:20 +00:00
Dan Willemsen
901e5ac899 Merge "link_type: common overrides 2nd"
am: a637a59b7e

Change-Id: I93f30dd9fb1b56ae10f3acc5279c7a2bbd52b6e2
2017-04-20 23:33:24 +00:00
Treehugger Robot
a637a59b7e Merge "link_type: common overrides 2nd" 2017-04-20 23:26:07 +00:00
Dan Willemsen
2b7f8ab577 link_type: common overrides 2nd
This is what intermediates-dir-for does (though it also auto-detects
some common classes, which we don't)

Test: build-aosp_arm64.ninja is identical
Change-Id: I4a3efa74e060d82658b856e68318cd92403a6149
2017-04-20 14:37:23 -07:00
Vishwath Mohan
eac1397cc3 Merge "Disable CFI for ASAN targets. (Make)"
am: 594eb16b02

Change-Id: I5d148e2d38f244c1779b79b10d893d6e551d6e9b
2017-04-20 21:34:15 +00:00
Treehugger Robot
594eb16b02 Merge "Disable CFI for ASAN targets. (Make)" 2017-04-20 21:28:13 +00:00
Dan Willemsen
8156e82fa7 Merge "Fix LOCAL_MULTILIB := 64 in TARGET_TRANSLATE_2ND_ARCH builds"
am: 2f9b9f0938

Change-Id: Ib95c950f13747a8476bcf9fb5876acab892d75ee
2017-04-20 21:17:14 +00:00
Treehugger Robot
2f9b9f0938 Merge "Fix LOCAL_MULTILIB := 64 in TARGET_TRANSLATE_2ND_ARCH builds" 2017-04-20 21:13:04 +00:00
Dan Austin
625820cf3a Merge "Update fuzz_test makefile."
am: 64e48c0b51

Change-Id: I150afee55af70d7c4094e41ebab066af3cd30c26
2017-04-20 20:39:11 +00:00
Dan Austin
64e48c0b51 Merge "Update fuzz_test makefile." 2017-04-20 20:29:39 +00:00
Dan Willemsen
2e3c3cf537 Fix LOCAL_MULTILIB := 64 in TARGET_TRANSLATE_2ND_ARCH builds
64-bit only apps should only be enabled if the target supports 64-bit.

Test: lunch aosp_x86_arm-userdebug; m -j PMTest_Java64
Change-Id: Ibdc863730e97b1a89efb44840a1c633e9951a1d1
2017-04-20 11:19:10 -07:00
Dan Willemsen
d76aaed983 Merge "Rewrite link type checking"
am: e4d92ef568

Change-Id: Iba88d5113ef0ce9321fb98057261323ec160d6a9
2017-04-20 15:10:18 +00:00