Mark Salyzyn
f8b86e2651
Merge "fs_config_generate: README" am: 058e2f7b19 am: ccf3fcaba0
...
am: 4f254445e7
2017-03-27 23:38:52 +00:00
Mark Salyzyn
4f254445e7
Merge "fs_config_generate: README" am: 058e2f7b19
...
am: ccf3fcaba0
2017-03-27 23:35:49 +00:00
Mark Salyzyn
ccf3fcaba0
Merge "fs_config_generate: README"
...
am: 058e2f7b19
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
2017-03-27 20:12:11 +00:00
Jeff Vander Stoep
856b00b8db
Merge "embedded.mk: Make phony selinux_policy" am: b30c12df3e
...
am: 6d418a86b7
2017-03-27 20:09:41 +00:00
Jeff Vander Stoep
6d418a86b7
Merge "embedded.mk: Make phony selinux_policy"
...
am: b30c12df3e
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
2017-03-26 05:35:59 +00:00
Tianjie Xu
1b7e203272
Merge "Fix unittest for blockimgdiff" am: 36bcb78eb9
...
am: 0e6a7f1838
2017-03-26 05:33:28 +00:00
Tianjie Xu
0e6a7f1838
Merge "Fix unittest for blockimgdiff"
...
am: 36bcb78eb9
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
2017-03-25 05:26:21 +00:00
Dimitry Ivanov
4926df7b5f
Merge "Add ld.config.txt to rootdir/etc" am: 86559441a1
...
am: 3fd5bf0f82
2017-03-25 05:23:48 +00:00
Dimitry Ivanov
3fd5bf0f82
Merge "Add ld.config.txt to rootdir/etc"
...
am: 86559441a1
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
2017-03-24 23:21:43 +00:00
Dan Willemsen
60ff056b6f
Merge "Fix fileslist for system other image" am: b05fe25b9f
...
am: eb90e156e1
2017-03-24 23:19:42 +00:00
Dan Willemsen
eb90e156e1
Merge "Fix fileslist for system other image"
...
am: b05fe25b9f
2017-03-24 23:17:12 +00:00
Treehugger Robot
b05fe25b9f
Merge "Fix fileslist for system other image"
2017-03-24 23:10:02 +00:00
Dan Willemsen
5c8542e1b4
Fix fileslist for system other image
...
This got lost from the previous backport, since systemotherimage wasn't
in AOSP yet.
(The Merged-In is a random Change-Id only on master so that this only
merges up to master)
Test: lunch aosp_marlin-eng; m -j systemotherimage
Change-Id: I92c05f27c92d877f3b83e5c5ae2e76728eb162bd
Merged-In: Iafed66e19bc114552b0261dd299379dbb37873c6
2017-03-24 21:26:21 +00:00
TreeHugger Robot
d4bcd158a5
Merge "Use HWC2 for all emulator images."
2017-03-24 21:03:37 +00:00
Christopher Ferris
36a570f7e0
Merge "Small fixes for environment variables." am: fd0cb496b1 am: 37f3a728a0
...
am: 7eb7796868
2017-03-24 16:23:45 +00:00
Christopher Ferris
7eb7796868
Merge "Small fixes for environment variables." am: fd0cb496b1
...
am: 37f3a728a0
2017-03-24 16:21:43 +00:00
Christopher Ferris
37f3a728a0
Merge "Small fixes for environment variables."
...
am: fd0cb496b1
2017-03-24 16:19:43 +00:00
Christopher Ferris
fd0cb496b1
Merge "Small fixes for environment variables."
2017-03-24 16:15:07 +00:00
Mark Salyzyn
87ba0144f8
fs_config_generate: README
...
Test: none
Bug: 36071012
Change-Id: If30461fb9c522f705874fdfdc2b7cd54a5c3732e
2017-03-24 08:57:27 -07:00
Jiyong Park
06241051e8
Make telephony work on generic system image
...
Bug: 36070427
Test: modem is up and emergency call can be made
Change-Id: Ic09200943a7ae7c51e420c6485f3b1b95c702265
2017-03-24 08:47:47 +00:00
TreeHugger Robot
e496c6a76f
Merge "Add libion to the generic sytem image for camera"
2017-03-24 07:56:57 +00:00
TreeHugger Robot
75187d0d8e
Merge "Add wifi support to the generic system image"
2017-03-24 07:51:34 +00:00
Dan Willemsen
bf9edaafc0
Merge "Depend on (bs|img)diff for target-files-package" am: 90151623fc am: e9e4001b34
...
am: 29651c25fa
2017-03-24 07:33:13 +00:00
Dan Willemsen
29651c25fa
Merge "Depend on (bs|img)diff for target-files-package" am: 90151623fc
...
am: e9e4001b34
2017-03-24 07:31:40 +00:00
Dan Willemsen
e9e4001b34
Merge "Depend on (bs|img)diff for target-files-package"
...
am: 90151623fc
2017-03-24 07:29:42 +00:00
Dan Willemsen
90151623fc
Merge "Depend on (bs|img)diff for target-files-package"
2017-03-24 07:24:36 +00:00
Jiyong Park
a14bf425f7
Add libion to the generic sytem image for camera
...
Camera HAL is using libion. I believe libion is generic library, so put
it in this generic system image.
Bug: 36043196
Test: make, flash and check that libion.so is in /system/lib.
Change-Id: I2e6b68e5899e27c603476ad7c5cd64f3cd5a8c53
2017-03-24 06:29:02 +00:00
Dan Willemsen
d79a08f9fb
Depend on (bs|img)diff for target-files-package
...
add_img_to_target_files may use these to create the recovery patch, so
add a dependency. They were previously a transitive dependency through
the system image to the standalone recovery patch creation.
Bug: 36575896
Test: rm out/host/linux-x86/bin/imgdiff; m -j target-files-package
Change-Id: I2a43220e94c09393e88e1d9950032f5665a0d2ce
2017-03-23 22:09:06 -07:00
Colin Cross
1b81278572
Merge "Add TARGET_PLATFORM_VERSION to lunch" am: a007142381 am: 7b5dc8ad3e
...
am: 086d109f35
2017-03-24 00:27:16 +00:00
Colin Cross
086d109f35
Merge "Add TARGET_PLATFORM_VERSION to lunch" am: a007142381
...
am: 7b5dc8ad3e
2017-03-24 00:25:45 +00:00
Colin Cross
7b5dc8ad3e
Merge "Add TARGET_PLATFORM_VERSION to lunch"
...
am: a007142381
2017-03-24 00:24:16 +00:00
Treehugger Robot
a007142381
Merge "Add TARGET_PLATFORM_VERSION to lunch"
2017-03-24 00:14:01 +00:00
TreeHugger Robot
13af7e6e8d
Merge "Increase max heap size for javac to 2GB."
2017-03-23 23:21:19 +00:00
TreeHugger Robot
74922e8dfb
Merge "Remove dependency on marlin sepolicy"
2017-03-23 22:30:19 +00:00
Dan Willemsen
f33d764b33
Merge "Ensure /system/vendor symlink exists in target-files-package" am: ac8b2ab702 am: 5179e70cc3
...
am: d54ba0b9ff
2017-03-23 22:06:32 +00:00
