aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-11-05 21:58:14 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-11-05 21:58:14 +0000
commite8fc8a9e5d12626fe071cc86137763d246b9ed9c (patch)
treec0edf2341fe639fc498f81c0431967e57419a884
parent57a6b6ab0dab3f0a11480a95f66c8e7f202f3cb2 (diff)
downloadots-e8fc8a9e5d12626fe071cc86137763d246b9ed9c.tar.gz
Update makefiles after merge of Chromium at 5a645aa13b82
This commit was generated by merge_from_chromium.py. Change-Id: Ie60844c92351b08f08df1bfababef624d67e9b19
Diffstat
-rw-r--r--ots.target.darwin-arm.mk2
-rw-r--r--ots.target.darwin-arm64.mk2
-rw-r--r--ots.target.darwin-mips.mk2
-rw-r--r--ots.target.darwin-mips64.mk2
-rw-r--r--ots.target.darwin-x86.mk2
-rw-r--r--ots.target.darwin-x86_64.mk2
-rw-r--r--ots.target.linux-arm.mk2
-rw-r--r--ots.target.linux-arm64.mk2
-rw-r--r--ots.target.linux-mips.mk2
-rw-r--r--ots.target.linux-mips64.mk2
-rw-r--r--ots.target.linux-x86.mk2
-rw-r--r--ots.target.linux-x86_64.mk2
12 files changed, 24 insertions, 0 deletions
diff --git a/ots.target.darwin-arm.mk b/ots.target.darwin-arm.mk
index ffcfdd4..5fb1b71 100644
--- a/ots.target.darwin-arm.mk
+++ b/ots.target.darwin-arm.mk
@@ -117,6 +117,7 @@ MY_DEFS_Debug := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
@@ -215,6 +216,7 @@ MY_DEFS_Release := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
diff --git a/ots.target.darwin-arm64.mk b/ots.target.darwin-arm64.mk
index 01d9900..35788d2 100644
--- a/ots.target.darwin-arm64.mk
+++ b/ots.target.darwin-arm64.mk
@@ -106,6 +106,7 @@ MY_DEFS_Debug := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
@@ -192,6 +193,7 @@ MY_DEFS_Release := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
diff --git a/ots.target.darwin-mips.mk b/ots.target.darwin-mips.mk
index 23b4afc..e31c0c5 100644
--- a/ots.target.darwin-mips.mk
+++ b/ots.target.darwin-mips.mk
@@ -109,6 +109,7 @@ MY_DEFS_Debug := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
@@ -199,6 +200,7 @@ MY_DEFS_Release := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
diff --git a/ots.target.darwin-mips64.mk b/ots.target.darwin-mips64.mk
index 23b4afc..e31c0c5 100644
--- a/ots.target.darwin-mips64.mk
+++ b/ots.target.darwin-mips64.mk
@@ -109,6 +109,7 @@ MY_DEFS_Debug := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
@@ -199,6 +200,7 @@ MY_DEFS_Release := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
diff --git a/ots.target.darwin-x86.mk b/ots.target.darwin-x86.mk
index d4c3c9f..1319b81 100644
--- a/ots.target.darwin-x86.mk
+++ b/ots.target.darwin-x86.mk
@@ -112,6 +112,7 @@ MY_DEFS_Debug := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
@@ -204,6 +205,7 @@ MY_DEFS_Release := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
diff --git a/ots.target.darwin-x86_64.mk b/ots.target.darwin-x86_64.mk
index 70513f4..5b0cea6 100644
--- a/ots.target.darwin-x86_64.mk
+++ b/ots.target.darwin-x86_64.mk
@@ -111,6 +111,7 @@ MY_DEFS_Debug := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
@@ -202,6 +203,7 @@ MY_DEFS_Release := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
diff --git a/ots.target.linux-arm.mk b/ots.target.linux-arm.mk
index ffcfdd4..5fb1b71 100644
--- a/ots.target.linux-arm.mk
+++ b/ots.target.linux-arm.mk
@@ -117,6 +117,7 @@ MY_DEFS_Debug := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
@@ -215,6 +216,7 @@ MY_DEFS_Release := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
diff --git a/ots.target.linux-arm64.mk b/ots.target.linux-arm64.mk
index 01d9900..35788d2 100644
--- a/ots.target.linux-arm64.mk
+++ b/ots.target.linux-arm64.mk
@@ -106,6 +106,7 @@ MY_DEFS_Debug := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
@@ -192,6 +193,7 @@ MY_DEFS_Release := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
diff --git a/ots.target.linux-mips.mk b/ots.target.linux-mips.mk
index 23b4afc..e31c0c5 100644
--- a/ots.target.linux-mips.mk
+++ b/ots.target.linux-mips.mk
@@ -109,6 +109,7 @@ MY_DEFS_Debug := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
@@ -199,6 +200,7 @@ MY_DEFS_Release := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
diff --git a/ots.target.linux-mips64.mk b/ots.target.linux-mips64.mk
index 23b4afc..e31c0c5 100644
--- a/ots.target.linux-mips64.mk
+++ b/ots.target.linux-mips64.mk
@@ -109,6 +109,7 @@ MY_DEFS_Debug := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
@@ -199,6 +200,7 @@ MY_DEFS_Release := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
diff --git a/ots.target.linux-x86.mk b/ots.target.linux-x86.mk
index d4c3c9f..1319b81 100644
--- a/ots.target.linux-x86.mk
+++ b/ots.target.linux-x86.mk
@@ -112,6 +112,7 @@ MY_DEFS_Debug := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
@@ -204,6 +205,7 @@ MY_DEFS_Release := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
diff --git a/ots.target.linux-x86_64.mk b/ots.target.linux-x86_64.mk
index 70513f4..5b0cea6 100644
--- a/ots.target.linux-x86_64.mk
+++ b/ots.target.linux-x86_64.mk
@@ -111,6 +111,7 @@ MY_DEFS_Debug := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
@@ -202,6 +203,7 @@ MY_DEFS_Release := \
'-DDONT_EMBED_BUILD_METADATA' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
+ '-DENABLE_BASIC_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DVIDEO_HOLE=1' \
'-DENABLE_LOAD_COMPLETION_HACKS=1' \
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-28 05:05:57 +0000