Dan Willemsen
d2a32cf66a
Merge "Support custom my_copy_pairs in package-modules.mk" am: 5b91bd4ccb
am: 616764b247
am: b2f7189479
...
am: 0e59a32e8f
Change-Id: I64201c181653b4a067988909b802c288ab3a515d
2017-06-21 03:40:44 +00:00
SzuWei Lin
6a3ea9cf59
Merge "Add audio.a2dp.default to generic system image am: fbac1195e9
-s ours am: dba174c8a5
-s ours" into oc-dr1-dev-plus-aosp
...
am: 3d715ec019
-s ours
Change-Id: I438286738a1521f018f3eedc046bd6bd99084d83
2017-06-21 03:40:26 +00:00
SzuWei Lin
a58c34e075
Add audio.a2dp.default to generic system image am: fbac1195e9
am: ef8e26b220
-s ours
...
am: d2a1c31bdb
-s ours
Change-Id: I1da8cee5538c102cf0b1c818c564d06225087a77
2017-06-21 03:40:06 +00:00
Dan Willemsen
0e59a32e8f
Merge "Support custom my_copy_pairs in package-modules.mk" am: 5b91bd4ccb
am: 616764b247
...
am: b2f7189479
Change-Id: Id6875b2ae03daec9d7b4547fa1c151cb5c12ebb9
2017-06-21 03:06:30 +00:00
Android Build Merger (Role)
3d715ec019
Merge "Add audio.a2dp.default to generic system image am: fbac1195e9
-s ours am: dba174c8a5
-s ours" into oc-dr1-dev-plus-aosp
2017-06-21 03:00:45 +00:00
SzuWei Lin
0d1261f2d5
Add audio.a2dp.default to generic system image am: fbac1195e9
-s ours
...
am: dba174c8a5
-s ours
Change-Id: I4a8e4218013343c1368dc301559f89617386cb83
2017-06-21 03:00:33 +00:00
SzuWei Lin
d2a1c31bdb
Add audio.a2dp.default to generic system image am: fbac1195e9
...
am: ef8e26b220
-s ours
Change-Id: Ifdc24d8b0a3827f4a6ee42cb2ba2cf94cba7f536
2017-06-21 03:00:32 +00:00
Dan Willemsen
b2f7189479
Merge "Support custom my_copy_pairs in package-modules.mk" am: 5b91bd4ccb
...
am: 616764b247
Change-Id: I288d04b2e69c7f231f25905edcff19b31c6cf499
2017-06-21 03:00:30 +00:00
Dan Willemsen
616764b247
Merge "Support custom my_copy_pairs in package-modules.mk"
...
am: 5b91bd4ccb
Change-Id: I87afb199ec7504ca0c927332a641f93587a8480e
2017-06-21 02:54:31 +00:00
SzuWei Lin
dba174c8a5
Add audio.a2dp.default to generic system image
...
am: fbac1195e9
-s ours
Change-Id: I15cf602e840d3ac60e5c932fdb02099903349898
2017-06-21 02:48:33 +00:00
SzuWei Lin
ef8e26b220
Add audio.a2dp.default to generic system image
...
am: fbac1195e9
Change-Id: I0a5f13ec32cfac2caa5dbb8e979fb0dffa54be5e
2017-06-21 02:48:32 +00:00
Treehugger Robot
5b91bd4ccb
Merge "Support custom my_copy_pairs in package-modules.mk"
2017-06-21 02:36:14 +00:00
Bowgo Tsai
6c2d5269e8
Merge "Use make functions to convert a text to lower case" am: cd46f1012e
am: 5a7d87afce
am: 98e356910f
...
am: c1ccae5009
Change-Id: I8b3ea0a7751b86f24f70dceb298efaa048781ae3
2017-06-21 02:30:29 +00:00
Bowgo Tsai
c1ccae5009
Merge "Use make functions to convert a text to lower case" am: cd46f1012e
am: 5a7d87afce
...
am: 98e356910f
Change-Id: I4b2676842f25f4bc4e59c8be307892f22e53de95
2017-06-21 02:23:58 +00:00
Bowgo Tsai
98e356910f
Merge "Use make functions to convert a text to lower case" am: cd46f1012e
...
am: 5a7d87afce
Change-Id: I5da050178795dce0333b74ca91a7c18968ea5bd7
2017-06-21 02:18:31 +00:00
Bowgo Tsai
5a7d87afce
Merge "Use make functions to convert a text to lower case"
...
am: cd46f1012e
Change-Id: I737210f72379b1c77e8568556a1185bbc0c6bb16
2017-06-21 02:12:58 +00:00
SzuWei Lin
68ba24ab5d
Merge "Add audio.a2dp.default to generic system image" into oc-dr1-dev am: 4e08677575
...
am: e7a5506e1f
Change-Id: Ife6d2b9ae9745ff54dfce9b7506fd3aa702f711e
2017-06-21 02:12:57 +00:00
SzuWei Lin
e7a5506e1f
Merge "Add audio.a2dp.default to generic system image" into oc-dr1-dev
...
am: 4e08677575
Change-Id: I45aa7f7055dd4fe874daa2b1c2c8f8f317fe2f5a
2017-06-21 02:06:57 +00:00
TreeHugger Robot
4e08677575
Merge "Add audio.a2dp.default to generic system image" into oc-dr1-dev
2017-06-21 01:57:53 +00:00
Treehugger Robot
cd46f1012e
Merge "Use make functions to convert a text to lower case"
2017-06-21 01:56:08 +00:00
Yifan Hong
327ebfeffa
Merge "LOCAL_PROPRIETARY_MODULE implies LOCAL_USE_VNDK" am: 3952eef8ce
am: 7dbc8e08ce
am: ba5a198625
...
am: d728b292b1
Change-Id: I61af9549e242feaeb4846ac3f81fe58dbcddd102
2017-06-21 00:58:26 +00:00
Yifan Hong
d728b292b1
Merge "LOCAL_PROPRIETARY_MODULE implies LOCAL_USE_VNDK" am: 3952eef8ce
am: 7dbc8e08ce
...
am: ba5a198625
Change-Id: Iaa40b19c94c425b74a93d64c33bc5aa06f8c2690
2017-06-21 00:53:55 +00:00
Yifan Hong
ba5a198625
Merge "LOCAL_PROPRIETARY_MODULE implies LOCAL_USE_VNDK" am: 3952eef8ce
...
am: 7dbc8e08ce
Change-Id: I99525848d5e12269351d18e237ea1e3f82967420
2017-06-21 00:49:25 +00:00
Yifan Hong
7dbc8e08ce
Merge "LOCAL_PROPRIETARY_MODULE implies LOCAL_USE_VNDK"
...
am: 3952eef8ce
Change-Id: I651ac922ea336c79880a3727cab621bb7167d20d
2017-06-21 00:44:54 +00:00
Treehugger Robot
3952eef8ce
Merge "LOCAL_PROPRIETARY_MODULE implies LOCAL_USE_VNDK"
2017-06-21 00:33:24 +00:00
Dan Willemsen
f354b178b1
Support custom my_copy_pairs in package-modules.mk
...
To support extra files in package-modules.mk, allow the user to set
my_copy_pairs to a list of src:dest pairs that will be copied into the
zip file.
Test: build-aosp_arm.ninja is identical before/after
Test: codesearch says that these variables aren't otherwise used
Test: set my_copy_pairs, ensure that they exist in the zip.
Change-Id: Ia80cd136db8ad37a71010baf0552621b281c8bc3
2017-06-20 16:00:48 -07:00
Yifan Hong
3ca68183bb
LOCAL_PROPRIETARY_MODULE implies LOCAL_USE_VNDK
...
Test: m -j -k BOARD_VNDK_VERSION=true
Bug: 37342627
Change-Id: I6bb878eeb2a7b2cb4392fd60bc397e35ad51a6e2
Merged-In: I6bb878eeb2a7b2cb4392fd60bc397e35ad51a6e2
2017-06-20 15:42:37 -07:00
SzuWei Lin
03dad3be29
Merge "Remove unnecessary items in treble_common.mk" into oc-dr1-dev am: c7232cc5d5
...
am: 8e51a42f90
Change-Id: Ibb2632b6b376aa53f04e9bbfce66dc8a6f1364a6
2017-06-20 17:13:43 +00:00
SzuWei Lin
8e51a42f90
Merge "Remove unnecessary items in treble_common.mk" into oc-dr1-dev
...
am: c7232cc5d5
Change-Id: I5e4f45335343b7e63db587ad6f9bfaa5c5eabad1
2017-06-20 17:11:14 +00:00
Lucas Dupin
d625a80914
Require sysui overlay am: a426a60a6b
...
am: 2fb2b6f9cc
Change-Id: Ifc214dae6cc9e0f43466757d4d989950415a039f
2017-06-20 17:07:08 +00:00
TreeHugger Robot
c7232cc5d5
Merge "Remove unnecessary items in treble_common.mk" into oc-dr1-dev
2017-06-20 17:06:42 +00:00
Lucas Dupin
2fb2b6f9cc
Require sysui overlay
...
am: a426a60a6b
Change-Id: I036d14bc112f73d9372a0f2df56850f161bea98d
2017-06-20 16:58:23 +00:00
SzuWei Lin
fbac1195e9
Add audio.a2dp.default to generic system image
...
audio.a2dp.default is a system module. Generic system image includes
audio.a2dp.default to support A2DP if board has the capability.
Bug: 62649731
Test: build and check the file existance in system image
Merged-In: Iac4821b3daf993da9fc309b7b105db98ee4b89ce
Change-Id: I0d2194c4145927b21df5858a3787f8c210f2794c
(cherry picked from commit fe3191727b
)
2017-06-20 17:54:07 +08:00
Bowgo Tsai
e615afd6d0
Use make functions to convert a text to lower case
...
We cannot cache the result of ($shell ...) and we have to run these on
every build even if we don't have to re-read the makefiles. Replace it
with make functions $(substr $(substr ... )).
Bug: 38399657
Test: `make` pass, flash images from $OUT and boot device with chain partitions
Change-Id: I6d4ff8e487931ba25008a2a881401a8951d4049e
2017-06-20 17:44:00 +08:00
Bowgo Tsai
5bac3d86d6
Merge "AVB: support chain partition signing" am: 0effed4b94
am: dcad0945ab
am: abbba2c832
...
am: f184e3a35b
Change-Id: I3247fe4885984a8e7e9015a9bc2e2ee383b561a1
2017-06-20 07:12:35 +00:00
Bowgo Tsai
f184e3a35b
Merge "AVB: support chain partition signing" am: 0effed4b94
am: dcad0945ab
...
am: abbba2c832
Change-Id: I0ffdd31bad14c42afddf8180bf7d1e5e8a0f841d
2017-06-20 07:10:04 +00:00
Bowgo Tsai
abbba2c832
Merge "AVB: support chain partition signing" am: 0effed4b94
...
am: dcad0945ab
Change-Id: I5bc9f2dcc94b2db846d9956c0def6b3c9910b2c5
2017-06-20 07:07:33 +00:00
Bowgo Tsai
dcad0945ab
Merge "AVB: support chain partition signing"
...
am: 0effed4b94
Change-Id: Ic1383d4250563fdad15b37dae5f6aa2173099f57
2017-06-20 07:05:04 +00:00
Treehugger Robot
0effed4b94
Merge "AVB: support chain partition signing"
2017-06-20 06:57:34 +00:00
SzuWei Lin
fe3191727b
Add audio.a2dp.default to generic system image
...
audio.a2dp.default is a system module. Generic system image includes
audio.a2dp.default to support A2DP if board has the capability.
Bug: 62649731
Test: build and check the file existance in system image
Change-Id: Iac4821b3daf993da9fc309b7b105db98ee4b89ce
2017-06-19 17:59:20 +08:00
SzuWei Lin
cbd421fd0e
Remove unnecessary items in treble_common.mk
...
Bug: 62360563
Test: Build and check files are still exist in system image
Change-Id: Ie787969d072c5b89d377a2c0b01706764185d6a5
2017-06-19 17:58:30 +08:00
Lucas Dupin
a426a60a6b
Require sysui overlay
...
All builds should include the 2 systemui themes
Bug: 62346335
Change-Id: Iacfe3c7494f81ee05118a6f782a96c96ce901bb3
2017-06-18 18:49:45 -07:00
Dan Willemsen
252eba9b7f
Mark oc-dev-plus-aosp OPR1 as REL am: 0596384adb
-s ours
...
am: 996bb6dbe2
-s ours
Change-Id: I266f0c2ebd7de982026bc9160927c92605bc3a2c
2017-06-16 23:27:40 +00:00
Mathieu Chartier
1593bab1ea
Merge "Allow custom compiler filters for system server jars"
2017-06-16 23:08:14 +00:00
Dan Willemsen
996bb6dbe2
Mark oc-dev-plus-aosp OPR1 as REL
...
am: 0596384adb
-s ours
Change-Id: I82eb30022addf70c4a99a0ec5b9a4fa7f0a9497c
2017-06-16 23:05:14 +00:00
Dan Willemsen
0596384adb
Mark oc-dev-plus-aosp OPR1 as REL
...
It contains all of oc-dev, which has OPR1 marked as REL, so we should be
using API 26 instead of 'O'.
Test: Check PLATFORM_VERSION_CODENAME / PLATFORM_SDK_VERSION
Change-Id: I0e8f3b42b8ac60422f0a8b044de45ba03b0bcfcf
Merged-In: I036cc43c1f2aa5317ae1131dc31a1f96caa5081f
2017-06-16 15:02:51 -07:00
Suren Baghdasaryan
c9d52e2d32
Merge "Add makefile to define PRODUCT_SHIPPING_API_LEVEL for O release"
2017-06-16 21:10:23 +00:00
Mathieu Chartier
b8d3cc02cd
Allow custom compiler filters for system server jars
...
Passing down a compiler filter in LOCAL_DEX_PREOPT_FLAGS or
PRODUCT_DEX_PREOPT_DEFAULT_FLAGS will no longer always get
overridden to speed.
Bug: 62356545
Test: make and flash
Change-Id: I8b777c8881cba6b11cda56d27f0a714c92d70d94
2017-06-16 11:41:59 -07:00
Igor Murashkin
beb834d37e
Merge "core: Move core.oat bootjar definitions into envsetup.mk" into oc-dev-plus-aosp am: caa917ae3d
...
am: 5f5daa504e
Change-Id: I07a833d36a85df323e343cb8c6e0e11dc98132d3
2017-06-16 03:32:03 +00:00
Igor Murashkin
5f5daa504e
Merge "core: Move core.oat bootjar definitions into envsetup.mk" into oc-dev-plus-aosp
...
am: caa917ae3d
Change-Id: I312c7e60ef87dc2f400c992754e4093edfe300ee
2017-06-16 03:28:02 +00:00