Zach Riggle
953442280d
Merge "Add strace back onto userdebug builds" am: e02a37d046
am: 42ba61ca7c
...
am: 7aaf1eec54
Change-Id: Ice5c9dd7fa2686c8ff8dc431b9d80ed5821418c8
2017-10-18 06:05:43 +00:00
Zach Riggle
7aaf1eec54
Merge "Add strace back onto userdebug builds" am: e02a37d046
...
am: 42ba61ca7c
Change-Id: I31e9c3fd921c26658672605dabd6165d9f1d96cd
2017-10-18 06:03:06 +00:00
Zach Riggle
42ba61ca7c
Merge "Add strace back onto userdebug builds"
...
am: e02a37d046
Change-Id: I5930dee81f990c534e1553f5cbcff83afdfcd984
2017-10-18 06:00:39 +00:00
Treehugger Robot
e02a37d046
Merge "Add strace back onto userdebug builds"
2017-10-18 05:56:17 +00:00
Ian Pedowitz
03decac07c
Merge "master is now P" into stage-aosp-master am: 3bb60f4c6e
-s ours
...
am: 9491e619bd
-s ours
Change-Id: Ib81b4469ccc16b9e4260debb068716e98ba98af4
2017-10-18 02:55:50 +00:00
Ian Pedowitz
36b9a8b34b
master is now P am: 43a4731d8e
-s ours
...
am: bfd597b9cc
-s ours
Change-Id: I3edfec0dc3f6e4cd45dcfc5c34d69637f2ae0d88
2017-10-18 02:36:03 +00:00
Ian Pedowitz
9491e619bd
Merge "master is now P" into stage-aosp-master
...
am: 3bb60f4c6e
-s ours
Change-Id: I63901f1277addce8f8a805f654a783313815a31f
2017-10-18 02:23:16 +00:00
Ian Pedowitz
bfd597b9cc
master is now P
...
am: 43a4731d8e
-s ours
Change-Id: Ia968c0866a946cb128df89ddddcd385ffd68d919
2017-10-18 02:17:16 +00:00
TreeHugger Robot
3bb60f4c6e
Merge "master is now P" into stage-aosp-master
2017-10-18 02:03:43 +00:00
Dan Willemsen
bd7af08692
Merge "Switch envsetup.sh dumpvars to soong_ui" am: 2023783f4f
am: 114bf62d39
...
am: b88b6bcb78
Change-Id: Ic9130dc39e525178314e8c8a6a59fedbe247d46e
2017-10-18 01:12:54 +00:00
Dan Willemsen
b88b6bcb78
Merge "Switch envsetup.sh dumpvars to soong_ui" am: 2023783f4f
...
am: 114bf62d39
Change-Id: I991b209e5fb2589d1aac8dc6e5d16d6d87f686ea
2017-10-18 01:09:13 +00:00
Dan Willemsen
114bf62d39
Merge "Switch envsetup.sh dumpvars to soong_ui"
...
am: 2023783f4f
Change-Id: I060c886c8d52a339969e43469dae5cce8cd9e198
2017-10-18 01:04:45 +00:00
Treehugger Robot
2023783f4f
Merge "Switch envsetup.sh dumpvars to soong_ui"
2017-10-18 00:54:44 +00:00
Tom Cherry
70f86d2f96
Merge "Allow ro. properties to have arbitrary lengths" am: 1d6e8e31d0
am: 47b3003e9b
...
am: 646f3c2651
Change-Id: Ic1398ce6dee690b94e53e781296e8cbcddc4bfbf
2017-10-17 22:52:05 +00:00
Tom Cherry
646f3c2651
Merge "Allow ro. properties to have arbitrary lengths" am: 1d6e8e31d0
...
am: 47b3003e9b
Change-Id: I5018e0af0fbf7c3ddb17a76242cb99ed676ef12b
2017-10-17 22:46:43 +00:00
Tom Cherry
47b3003e9b
Merge "Allow ro. properties to have arbitrary lengths"
...
am: 1d6e8e31d0
Change-Id: I4a3872a59ba39289bf58741e19ca05b9b9c7bbee
2017-10-17 22:42:04 +00:00
Tom Cherry
1d6e8e31d0
Merge "Allow ro. properties to have arbitrary lengths"
2017-10-17 22:33:11 +00:00
Dan Willemsen
af88c41795
Switch envsetup.sh dumpvars to soong_ui
...
Use soong_ui instead of make&config.mk directly. This way we use a
consistent make parser and sandboxing configurations.
Test: printconfig
Test: get_build_var TARGET_DEVICE
Test: get_abs_build_var PRODUCT_OUT
Test: get_abs_build_var ALL_PRODUCTS
Test: lunch aosp_marlin-userdebug
Test: build_build_var_cache; set | grep var_cache (diff before/after)
Change-Id: I22abdf95669b7a4fb8162377e013a9013155f249
2017-10-17 13:13:30 -07:00
Zach Riggle
7d1f81a048
Add strace back onto userdebug builds
...
Blueprint stopped supporting the "debug" tag, per dwillemsen
Change-Id: I6c206e058ce32cbea3fd8ae922ac1ba5a0598410
2017-10-17 14:19:53 -05:00
Colin Cross
c5122aee9d
Merge "Use system modules generated by soong when using javac -target 1.9" am: 58cd98dc47
am: 7c381d8015
...
am: 3541a96d76
Change-Id: I70c1cabb3fe7f3c34c54d9b360259229d7bb6243
2017-10-17 18:57:03 +00:00
Colin Cross
3541a96d76
Merge "Use system modules generated by soong when using javac -target 1.9" am: 58cd98dc47
...
am: 7c381d8015
Change-Id: Id2bef3fcd07b5386394072925ea5c24008cb678d
2017-10-17 18:51:15 +00:00
Colin Cross
7c381d8015
Merge "Use system modules generated by soong when using javac -target 1.9"
...
am: 58cd98dc47
Change-Id: I1525b7088afee77baee014fd346cf19cf6a9641e
2017-10-17 18:43:21 +00:00
Colin Cross
58cd98dc47
Merge "Use system modules generated by soong when using javac -target 1.9"
2017-10-17 18:37:35 +00:00
Ian Pedowitz
43a4731d8e
master is now P
...
Fixes: 64141010
Test: source build/envsetup.sh && lunch marlin-userdebug
============================================
PLATFORM_VERSION_CODENAME=P
PLATFORM_VERSION=P
TARGET_PRODUCT=marlin
TARGET_BUILD_VARIANT=userdebug
TARGET_BUILD_TYPE=release
TARGET_PLATFORM_VERSION=PPR1
TARGET_BUILD_APPS=
TARGET_ARCH=arm64
TARGET_ARCH_VARIANT=armv8-a
TARGET_CPU_VARIANT=kryo
TARGET_2ND_ARCH=arm
TARGET_2ND_ARCH_VARIANT=armv7-a-neon
TARGET_2ND_CPU_VARIANT=kryo
HOST_ARCH=x86_64
HOST_2ND_ARCH=x86
HOST_OS=linux
HOST_OS_EXTRA=Linux-4.4.0-79-generic-x86_64-Ubuntu-14.04.5-LTS
HOST_CROSS_OS=windows
HOST_CROSS_ARCH=x86
HOST_CROSS_2ND_ARCH=x86_64
HOST_BUILD_TYPE=release
BUILD_ID=MASTER
OUT_DIR=out
AUX_OS_VARIANT_LIST=
============================================
Change-Id: I2d9019af8c4e24e34c743be85d4e0ff224de9d17
Merged-In: I2d9019af8c4e24e34c743be85d4e0ff224de9d17
Merged-In: Ida774a3bc6fa7884e328eb70abb6b2cca7c32028
(cherry picked from commit b56fcf400f
)
2017-10-17 18:00:23 +00:00
Yoshisato Yanagisawa
af4998f62f
Merge "Make SOONG_JAVAC_WRAPPER use JAVAC_WRAPPER to call javac." am: 51e7a0cca4
am: 5de0a22292
...
am: cf07f0dc22
Change-Id: I443f9e65ce46c5a834a420318f3629bc17f9e6cb
2017-10-17 06:04:28 +00:00
Yoshisato Yanagisawa
cf07f0dc22
Merge "Make SOONG_JAVAC_WRAPPER use JAVAC_WRAPPER to call javac." am: 51e7a0cca4
...
am: 5de0a22292
Change-Id: I1ab5a9cba0d7b8a54d722b698ced0dbfdd4ead54
2017-10-17 05:17:15 +00:00
Yoshisato Yanagisawa
5de0a22292
Merge "Make SOONG_JAVAC_WRAPPER use JAVAC_WRAPPER to call javac."
...
am: 51e7a0cca4
Change-Id: I2c311aa5442b26c046173be66ade18a73913673d
2017-10-17 05:15:13 +00:00
Treehugger Robot
51e7a0cca4
Merge "Make SOONG_JAVAC_WRAPPER use JAVAC_WRAPPER to call javac."
2017-10-17 05:08:10 +00:00
Ryan Campbell
4a57b1645e
Merge "Create product sysprops on vendor partition." into oc-mr1-dev
...
am: 5dbc0cab73
Change-Id: I13705b6d8337720dcf5d89d1a019a01a805e1c6c
2017-10-17 01:42:58 +00:00
Colin Cross
f960257c14
Use system modules generated by soong when using javac -target 1.9
...
Soong has support for building system modules. Use the directories
produced by Soong with --system to replace -bootclasspath arguments
when using javac -target 1.9.
Since soong can't generate current SDK stubs yet, and no existing
SDK stubs need -target, only use -target 1.9 for modules that are
not compiling against the SDK. That means in practice the only
system modules that will be used for now is the default one,
core-system-modules.
Bug: 63986449
Test: m -j EXPERIMENTAL_USE_OPENJDK9=true makes some progress
Change-Id: I350ef50aedf36fdd72458c23d4fe8a2edf1a9a02
2017-10-16 17:55:24 -07:00
Ryan Campbell
5dbc0cab73
Merge "Create product sysprops on vendor partition." into oc-mr1-dev
2017-10-16 23:11:41 +00:00
Mathieu Chartier
6a8fb8f75a
Merge changes from topic "move_to_go_defaults_512" into oc-mr1-dev
...
am: 241539e1ae
Change-Id: Icbce5fed1a6602f12d31f2ac31544b4bbfa53c76
2017-10-16 18:29:59 +00:00
Mathieu Chartier
8f8fe3ee4b
Split go_defaults into a 512 version and a normal version
...
am: 7267676258
Change-Id: I0ad8724097e27c35bded48f0db5a69bdc659d363
2017-10-16 18:29:33 +00:00
Mathieu Chartier
241539e1ae
Merge changes from topic "move_to_go_defaults_512" into oc-mr1-dev
...
* changes:
Add some properties to go_defaults_512.mk
Split go_defaults into a 512 version and a normal version
2017-10-16 18:24:55 +00:00
Mathieu Chartier
120a1bdad1
Add some properties to go_defaults_512.mk
...
Add lmkd tuning and madvise random hints.
Bug: 67374015
Test: make, flash, look at properties
Change-Id: Id5dfcc28ac9ea1b84f761f1b75ace45f12c47918
2017-10-15 20:22:12 -07:00
Mathieu Chartier
7267676258
Split go_defaults into a 512 version and a normal version
...
Added go_defauls_common.mk for settings common to both 512 and other
Go devices. Added go_defaults_512 for 512MB RAM devices.
Bug: 67374015
Test: make, flash, look at properties
Change-Id: I160118e397a2f53d64df4a6d8e77aec3553fa401
2017-10-15 20:13:06 -07:00
Elliott Hughes
51ec0bda61
Merge "external/svox is going away." am: ff806ece8d
am: 635febc86f
...
am: 1a79b21385
Change-Id: I74ec971eab347967e5ffde3246ee58b402e6414f
2017-10-15 03:33:13 +00:00
Dan Willemsen
0f62817417
Merge "Switch to $(file) instead of a rule to create soong.variables" am: a0d0ea3b5c
am: 9ecc0da241
...
am: 05fda09148
Change-Id: I2e622fbcc0c495969942aecd576d66310b0795b1
2017-10-15 03:30:42 +00:00
Dan Albert
a1186114a7
Merge "Re-apply ndk-docs rule." am: cf2da22a2a
am: 4adab14288
...
am: 97f9bef929
Change-Id: Idb98ee33ad258838982413d5a659a09ac4f24448
2017-10-15 03:29:48 +00:00
Elliott Hughes
d857603851
Merge "Remove PicoTTS from the base." am: 05cf348722
am: 529f794352
...
am: 891ea7806a
Change-Id: Ic237c6af78ecaf6ae0c21b11c1da060a84ed8532
2017-10-15 03:28:36 +00:00
Bowgo Tsai
0e1ada16ce
Merge "Adding Android verified boot 1.0 metadata into ENG builds" am: 5f958ccad5
am: 86c4f8ed54
...
am: 08a05cd9ae
Change-Id: Ie7471976439616452b0c830b19471be1748a750a
2017-10-15 03:26:24 +00:00
Mathieu Chartier
6ab87f8fe4
Merge "Re-add missing log filter" am: 9e89b22ae7
am: dc640ca34a
...
am: 0cb9d7a4c7
Change-Id: I0abdcf6c1c892439c83f417405d22b9fb6da9df0
2017-10-15 03:25:08 +00:00
Elliott Hughes
1a79b21385
Merge "external/svox is going away." am: ff806ece8d
...
am: 635febc86f
Change-Id: I68bfc2d6bd4989b8311fd039ff65d0942772cfda
2017-10-15 03:14:52 +00:00
Dan Willemsen
05fda09148
Merge "Switch to $(file) instead of a rule to create soong.variables" am: a0d0ea3b5c
...
am: 9ecc0da241
Change-Id: I27a139fa343b64e8f3fcf02925605877eb10a65d
2017-10-15 03:12:36 +00:00
Dan Albert
97f9bef929
Merge "Re-apply ndk-docs rule." am: cf2da22a2a
...
am: 4adab14288
Change-Id: I8bc2c7b314a18f2870f34a93683c1afba2540f4d
2017-10-15 03:11:28 +00:00
Elliott Hughes
891ea7806a
Merge "Remove PicoTTS from the base." am: 05cf348722
...
am: 529f794352
Change-Id: I63e841f191aa423b68b42de8a300c27169cb6153
2017-10-15 03:10:29 +00:00
Elliott Hughes
635febc86f
Merge "external/svox is going away."
...
am: ff806ece8d
Change-Id: I1c3fa0d99c6cf53c6266e7c775addcbde56114f9
2017-10-15 03:09:30 +00:00
Bowgo Tsai
08a05cd9ae
Merge "Adding Android verified boot 1.0 metadata into ENG builds" am: 5f958ccad5
...
am: 86c4f8ed54
Change-Id: I3fcdd659de74524b694e16581aaeea2d412245e0
2017-10-15 03:08:02 +00:00
Mathieu Chartier
0cb9d7a4c7
Merge "Re-add missing log filter" am: 9e89b22ae7
...
am: dc640ca34a
Change-Id: I4eefddf305ccd7e71d94863c231316b80c4bf68f
2017-10-15 03:06:56 +00:00
Adam Seaton
51c969da28
Update Security String to 2017-12-01 For December Security Bug: 67774760 am: 47ac5ac8aa
am: 893343fa7b
...
am: b2d1ce3cc6
Change-Id: I3d076378768a72bb0b507ba0f33ffb4d86ab9bbd
2017-10-15 03:01:28 +00:00