Commit Graph

36423 Commits

Author SHA1 Message Date
Colin Cross
e641bef825 Merge "Move comments to the previous line" am: 906a3ea5d6 am: 8fb3f39bcd
am: 96c28f9670  -s ours

Change-Id: I07a4da68abe05d5d7779a3f022a13bf1eed40a21
2017-03-28 22:43:12 +00:00
Colin Cross
96c28f9670 Merge "Move comments to the previous line" am: 906a3ea5d6
am: 8fb3f39bcd

Change-Id: Ic2db6854999265f15cad5655ee84745ce4cc5f17
2017-03-28 22:34:41 +00:00
Colin Cross
8fb3f39bcd Merge "Move comments to the previous line"
am: 906a3ea5d6

Change-Id: I70787abb1a80987fb89a4444c68b9658c80c0622
2017-03-28 22:27:44 +00:00
Treehugger Robot
906a3ea5d6 Merge "Move comments to the previous line" 2017-03-28 22:17:52 +00:00
Makoto Onuki
c716fbab8b Merge "Add USE_FILESLIST_GO to switch to fileslist.go" into oc-dev
am: fe3d3490fb

Change-Id: Ib4daaa3f623d553db4935dd497269448705cfb28
2017-03-28 21:23:59 +00:00
Makoto Onuki
fe3d3490fb Merge "Add USE_FILESLIST_GO to switch to fileslist.go" into oc-dev 2017-03-28 21:15:24 +00:00
Colin Cross
c901659377 Add min and max supported versions
Add MIN_PLATFORM_VERSION and MAX_PLATFORM_VERSION to track
the range of releases that are expected to be released from
the current branch.

Also simplify version_defaults.mk by moving most of the code
to envsetup.mk.

Test: build/make/tests/envsetup_tests.sh
Change-Id: I4f19c31c267e202f8f5ba1384a8b4385d725f9d7
2017-03-28 13:32:04 -07:00
Colin Cross
4a867dbdf7 Move comments to the previous line
am: 8204eb1a87

Change-Id: I87318a65485b7749d612b1d9cc292605b165be37
2017-03-28 20:28:04 +00:00
Colin Cross
349a7a7f1a Move comments to the previous line
End-of-line comments cause the variable to be set to a space, which
confuses using ifdef on it.

Test: builds
Change-Id: I7b1eb3b9febff1a5a5fca1e6623b2b36d538dacc
Merged-In: I7b1eb3b9febff1a5a5fca1e6623b2b36d538dacc
2017-03-28 13:24:45 -07:00
Makoto Onuki
517d32d4da Add USE_FILESLIST_GO to switch to fileslist.go
fileslist.go is still disabled by default.  To enable, use:
USE_FILESLIST_GO=true m -j

Bug: 36274890
Test: Manual, with m -j

Change-Id: I722e17fa7fb6ba91e2b2c44cd7524d974cbe4a56
(cherry picked from commit 9fe97e231b)
2017-03-28 13:19:03 -07:00
Colin Cross
8204eb1a87 Move comments to the previous line
End-of-line comments cause the variable to be set to a space, which
confuses using ifdef on it.

Test: builds
Change-Id: I7b1eb3b9febff1a5a5fca1e6623b2b36d538dacc
2017-03-28 17:05:18 +00:00
Makoto Onuki
c99ba3fb96 Merge "Add USE_FILESLIST_GO to switch to fileslist.go" am: d625ef2894 am: 0a069a74c2
am: 6a05fb3d33

Change-Id: I9d49341e4e9145151a728160944276b43f83d76e
2017-03-28 16:58:23 +00:00
Makoto Onuki
6a05fb3d33 Merge "Add USE_FILESLIST_GO to switch to fileslist.go" am: d625ef2894
am: 0a069a74c2

Change-Id: I69bbc553b35df6f06366a6a25794d848e82f7f71
2017-03-28 16:54:22 +00:00
Makoto Onuki
0a069a74c2 Merge "Add USE_FILESLIST_GO to switch to fileslist.go"
am: d625ef2894

Change-Id: I6d869be0b7ab9084168803ceaaf58fc2ba3c8da5
2017-03-28 16:50:21 +00:00
Esteban Talavera
10ecd56447 Revert "Remove resource overlays"
am: deb26ad395

Change-Id: I210009073d757f683f466d891c54ee8d055096dc
2017-03-28 16:42:55 +00:00
Makoto Onuki
d625ef2894 Merge "Add USE_FILESLIST_GO to switch to fileslist.go" 2017-03-28 16:41:05 +00:00
Esteban Talavera
deb26ad395 Revert "Remove resource overlays"
This reverts commit 1dcf689c3b.

The CL broke git_master/sailfish-userdebug_P and oc-release/marlin_svelte

Bug: 36231603
Test: "make" works again for oc-release/marlin_svelte after reverting both CLs from this topic

Change-Id: I861b8b11c29293fb4a0c746768c03bc4eb986807
2017-03-28 17:02:20 +01:00
Denis Vnukov
562ac35058 Changing default Jack arguments.
This change sets Jack default arguments to enable some of lambda
optimizations, namely: lambda grouping in scope of a single package
and using singletin lambda objects for stateless lambdas.

Test: tested manually

Change-Id: Id2d0c37e3462f1e3137cfef2684cf6e74df6089b
2017-03-28 12:13:32 +02:00
Dan Willemsen
2c3289bf37 Ensure that BOARD_VNDK_VERSION is current
BOARD_VNDK_VERSION controls which version of the VNDK is used for the
build. We only support compiling against the current VNDK, and we don't
support installing old prebuilt VNDK libraries yet, so ensure this
variable is set to "current".

Once we support installing old prebuilt VNDK libraries, we'll also need
to disable building modules that use the VNDK.

Test: build-aosp_arm.ninja is the same before/after
Test: Ensure there are no boards that set BOARD_VNDK_VERSION
Test: Set BOARD_VNDK_VERSION := invalid
Change-Id: Ic26c9f44e356a0734f522b4538cb866d5b901d43
2017-03-27 22:55:21 -07:00
Steve Muckle
5c06e9702a Merge "Fix modules.dep breakage with multiple module dependencies" am: 73461abd0c am: 9c0198e6e9
am: f54833b9d9

Change-Id: I23e179b3442365eaa5862fb2a1f08b3d9f600279
2017-03-28 01:30:58 +00:00
Steve Muckle
f54833b9d9 Merge "Fix modules.dep breakage with multiple module dependencies" am: 73461abd0c
am: 9c0198e6e9

Change-Id: I4e1ecf13d31bec16a4fe44358c1dd8def0203916
2017-03-28 01:26:57 +00:00
Steve Muckle
9c0198e6e9 Merge "Fix modules.dep breakage with multiple module dependencies"
am: 73461abd0c

Change-Id: I96080a797abb1f9d9887ab993082ce0c10a931ca
2017-03-28 01:21:57 +00:00
Treehugger Robot
73461abd0c Merge "Fix modules.dep breakage with multiple module dependencies" 2017-03-28 01:11:39 +00:00
TreeHugger Robot
0b1e95f08b Merge "Remove resource overlays" 2017-03-28 01:02:54 +00:00
Mark Salyzyn
f8b86e2651 Merge "fs_config_generate: README" am: 058e2f7b19 am: ccf3fcaba0
am: 4f254445e7

Change-Id: I334f9f5183ae93ba2db01bd82d10528967e024c0
2017-03-27 23:38:52 +00:00
Mark Salyzyn
4f254445e7 Merge "fs_config_generate: README" am: 058e2f7b19
am: ccf3fcaba0

Change-Id: I5f51fdbaf65d919d3173a35c473f288bcce0a6b7
2017-03-27 23:35:49 +00:00
Mark Salyzyn
ccf3fcaba0 Merge "fs_config_generate: README"
am: 058e2f7b19

Change-Id: Id8cf39f5657640e099468abed741f0fa928a55f9
2017-03-27 23:33:20 +00:00
Mark Salyzyn
058e2f7b19 Merge "fs_config_generate: README" 2017-03-27 23:29:02 +00:00
Steve Muckle
b74e0b9b0d Fix modules.dep breakage with multiple module dependencies
If a module has multiple dependencies, the current regexp for making
the dependencies absolute paths only modifies the first dependency.

Test: build sailfish with module configuration including multiple
      dependencies
Change-Id: I8f2b40c8c5ec228aa8f831086bcdd561c8714910
2017-03-27 13:48:28 -07:00
Jeff Vander Stoep
b8093c0e87 Merge "embedded.mk: Make phony selinux_policy" am: b30c12df3e am: 6d418a86b7
am: 856b00b8db

Change-Id: Ib3fc261851e1a19eea91513f0ea2fbe3dde5ba1c
2017-03-27 20:12:11 +00:00
Jeff Vander Stoep
856b00b8db Merge "embedded.mk: Make phony selinux_policy" am: b30c12df3e
am: 6d418a86b7

Change-Id: I0a3a16012ac66706974f893c1c56295e1f13c326
2017-03-27 20:09:41 +00:00
Jeff Vander Stoep
6d418a86b7 Merge "embedded.mk: Make phony selinux_policy"
am: b30c12df3e

Change-Id: Iba9b4c92d1772f50f77a112747b32d4c4290e363
2017-03-27 20:06:41 +00:00
Treehugger Robot
b30c12df3e Merge "embedded.mk: Make phony selinux_policy" 2017-03-27 20:03:04 +00:00
TreeHugger Robot
e6689ed44f Merge "Remove mailin/sailfish fstab from the generic system image" 2017-03-27 19:33:30 +00:00
Scott Main
803e7d0e86 Delete all of templates-sdk/.
These files are now located in external/doclava/res/assets/
Related CLs:
https://googleplex-android-review.git.corp.google.com/#/c/1524290/
https://googleplex-android-review.git.corp.google.com/#/c/1928220/

Change-Id: Ia7dba884897c5b69243055190b6283537d35717f
2017-03-27 17:23:36 +00:00
Jiyong Park
d68246c8e4 Remove mailin/sailfish fstab from the generic system image
fstab files are now in /vendor/etc. No need to have it in system.

Bug: 36229492
Test: aosp_arm64_ab should boot in sailfish/marlin
Change-Id: I9ced5361ce3e3a98722d45124ee58d4411f06273
2017-03-27 15:46:34 +09:00
Jaekyun Seok
1dcf689c3b Remove resource overlays
Test: building succeeded and tested on sailfish and marlin with
http://ag/2009238.
Bug: 36231603

Change-Id: I82d672cbdca3b8597de71c821df8fb92f27318f3
2017-03-27 14:52:57 +09:00
Jeff Vander Stoep
2064364765 embedded.mk: Make phony selinux_policy
Moves selinux policy build decisions to system/sepolicy/Android.mk.
This is done because the PRODUCT_FULL_TREBLE variable isn't available
in embedded.mk and TARGET_SANITIZE isn't available to dependencies of
init.

Test: Build/boot Bullhead PRODUCT_FULL_TREBLE=false
Test: Build/boot Marlin PRODUCT_FULL_TREBLE=true
Test: Build Marlin TARGET_SANITIZE=address. Verify asan rules are
      included in policy output.

Bug: 36138508
Change-Id: I792786cd867bae3e1baeb824167a848948a719df
2017-03-26 14:51:38 -07:00
Tianjie Xu
7224a8ff83 Merge "Fix unittest for blockimgdiff" am: 36bcb78eb9 am: 0e6a7f1838
am: 1b7e203272

Change-Id: Id6db83ef492aec3aba8ef8bf4c00658963ffaef3
2017-03-26 05:35:59 +00:00
Tianjie Xu
1b7e203272 Merge "Fix unittest for blockimgdiff" am: 36bcb78eb9
am: 0e6a7f1838

Change-Id: I002d5aae7bf8d6e14ba5b4882a3fdd8b4f93f555
2017-03-26 05:33:28 +00:00
Tianjie Xu
0e6a7f1838 Merge "Fix unittest for blockimgdiff"
am: 36bcb78eb9

Change-Id: If32bcc2356fc4b251481b3b7d664af6736bc3caf
2017-03-26 05:30:58 +00:00
Tianjie Xu
36bcb78eb9 Merge "Fix unittest for blockimgdiff" 2017-03-26 05:25:48 +00:00
Dimitry Ivanov
b5bbf1ad0f Merge "Add ld.config.txt to rootdir/etc" am: 86559441a1 am: 3fd5bf0f82
am: 4926df7b5f

Change-Id: Ie5ba33fe45bfaa069f3454e50b5eaf3ca5df1deb
2017-03-25 05:26:21 +00:00
Dimitry Ivanov
4926df7b5f Merge "Add ld.config.txt to rootdir/etc" am: 86559441a1
am: 3fd5bf0f82

Change-Id: If88cea58d006708fd7f31507cbcb3efd32293247
2017-03-25 05:23:48 +00:00
Dimitry Ivanov
3fd5bf0f82 Merge "Add ld.config.txt to rootdir/etc"
am: 86559441a1

Change-Id: I35da84dceb546c04494e16106745b63cc80234b0
2017-03-25 05:21:15 +00:00
Treehugger Robot
86559441a1 Merge "Add ld.config.txt to rootdir/etc" 2017-03-25 05:17:32 +00:00
Tianjie Xu
a011dec9b2 Fix unittest for blockimgdiff
The test broke due to api change in constructor of Transfer.

Bug: 36456381
Test: blockimgdiff test passes
Change-Id: Ic73b66f8fb6141ff6f50c113b0d8cc55d34e0b5d
2017-03-24 16:28:16 -07:00
Dan Willemsen
7207c19303 Merge "Fix fileslist for system other image" am: b05fe25b9f am: eb90e156e1
am: 60ff056b6f  -s ours

Change-Id: Ib69f2431a7c39247888f36b72feb7c1bec88ce4e
2017-03-24 23:21:43 +00:00
Dan Willemsen
60ff056b6f Merge "Fix fileslist for system other image" am: b05fe25b9f
am: eb90e156e1

Change-Id: Iab1644dafeeae80254d5a0c0aeabc9bff6cfc1e2
2017-03-24 23:19:42 +00:00
Dan Willemsen
eb90e156e1 Merge "Fix fileslist for system other image"
am: b05fe25b9f

Change-Id: I63edd0d9aa171189911948a9da80b5b5e6368109
2017-03-24 23:17:12 +00:00