diff options
| author | Ben Murdoch <benm@google.com> | 2013-07-24 10:36:34 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2013-07-24 10:36:34 +0100 |
| commit | a3f7b4e666c476898878fa745f637129375cd889 (patch) | |
| tree | 1d78b48780e4c8603c226fd88d8f4b786f00bb81 /components | |
| parent | d4336a7d5c149891bede0c3201c8e831520067af (diff) | |
| download | chromium_org-a3f7b4e666c476898878fa745f637129375cd889.tar.gz | |
Merge from Chromium at DEPS revision r213371
This commit was generated by merge_to_master.py.
Change-Id: I35a74205de4bff52a2dd6b15330f8a002a39efaf
Diffstat (limited to 'components')
140 files changed, 1365 insertions, 682 deletions
diff --git a/components/auto_login_parser.target.darwin-arm.mk b/components/auto_login_parser.target.darwin-arm.mk index 43163b3702..c7476b1445 100644 --- a/components/auto_login_parser.target.darwin-arm.mk +++ b/components/auto_login_parser.target.darwin-arm.mk @@ -69,10 +69,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DPOSIX_AVOID_MMAP' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ @@ -152,10 +152,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DPOSIX_AVOID_MMAP' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ diff --git a/components/auto_login_parser.target.darwin-mips.mk b/components/auto_login_parser.target.darwin-mips.mk index 961d43c59d..ee40c083ae 100644 --- a/components/auto_login_parser.target.darwin-mips.mk +++ b/components/auto_login_parser.target.darwin-mips.mk @@ -68,10 +68,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DPOSIX_AVOID_MMAP' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ @@ -150,10 +150,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DPOSIX_AVOID_MMAP' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ diff --git a/components/auto_login_parser.target.darwin-x86.mk b/components/auto_login_parser.target.darwin-x86.mk index 59bafd0d6a..e50ec4a10d 100644 --- a/components/auto_login_parser.target.darwin-x86.mk +++ b/components/auto_login_parser.target.darwin-x86.mk @@ -71,10 +71,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -156,10 +156,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ diff --git a/components/auto_login_parser.target.linux-arm.mk b/components/auto_login_parser.target.linux-arm.mk index 43163b3702..c7476b1445 100644 --- a/components/auto_login_parser.target.linux-arm.mk +++ b/components/auto_login_parser.target.linux-arm.mk @@ -69,10 +69,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DPOSIX_AVOID_MMAP' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ @@ -152,10 +152,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DPOSIX_AVOID_MMAP' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ diff --git a/components/auto_login_parser.target.linux-mips.mk b/components/auto_login_parser.target.linux-mips.mk index 961d43c59d..ee40c083ae 100644 --- a/components/auto_login_parser.target.linux-mips.mk +++ b/components/auto_login_parser.target.linux-mips.mk @@ -68,10 +68,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DPOSIX_AVOID_MMAP' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ @@ -150,10 +150,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DPOSIX_AVOID_MMAP' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ diff --git a/components/auto_login_parser.target.linux-x86.mk b/components/auto_login_parser.target.linux-x86.mk index 59bafd0d6a..e50ec4a10d 100644 --- a/components/auto_login_parser.target.linux-x86.mk +++ b/components/auto_login_parser.target.linux-x86.mk @@ -71,10 +71,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -156,10 +156,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ diff --git a/components/autofill/content/browser/autocheckout_manager_unittest.cc b/components/autofill/content/browser/autocheckout_manager_unittest.cc index e5d5aa5e71..3b39631da8 100644 --- a/components/autofill/content/browser/autocheckout_manager_unittest.cc +++ b/components/autofill/content/browser/autocheckout_manager_unittest.cc @@ -7,7 +7,6 @@ #include "base/strings/utf_string_conversions.h" #include "base/tuple.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h" -#include "chrome/test/base/testing_profile.h" #include "components/autofill/content/browser/autocheckout_manager.h" #include "components/autofill/core/browser/autofill_common_test.h" #include "components/autofill/core/browser/autofill_manager.h" @@ -417,7 +416,6 @@ class AutocheckoutManagerTest : public ChromeRenderViewHostTestHarness { virtual void SetUp() OVERRIDE { SetThreadBundleOptions(content::TestBrowserThreadBundle::REAL_IO_THREAD); ChromeRenderViewHostTestHarness::SetUp(); - profile()->CreateRequestContext(); autofill_manager_delegate_.reset(new MockAutofillManagerDelegate()); autofill_driver_.reset(new TestAutofillDriver(web_contents())); autofill_manager_.reset(new TestAutofillManager( @@ -432,7 +430,6 @@ class AutocheckoutManagerTest : public ChromeRenderViewHostTestHarness { autofill_manager_delegate_.reset(); autofill_manager_.reset(); autofill_driver_.reset(); - profile()->ResetRequestContext(); ChromeRenderViewHostTestHarness::TearDown(); } diff --git a/components/autofill/content/browser/wallet/wallet_client_unittest.cc b/components/autofill/content/browser/wallet/wallet_client_unittest.cc index 6536c3e39a..9360b95039 100644 --- a/components/autofill/content/browser/wallet/wallet_client_unittest.cc +++ b/components/autofill/content/browser/wallet/wallet_client_unittest.cc @@ -20,7 +20,7 @@ #include "components/autofill/core/browser/autofill_metrics.h" #include "components/autofill/core/common/autocheckout_status.h" #include "content/public/test/test_browser_context.h" -#include "content/public/test/test_browser_thread.h" +#include "content/public/test/test_browser_thread_bundle.h" #include "net/base/escape.h" #include "net/base/net_errors.h" #include "net/http/http_request_headers.h" @@ -658,8 +658,6 @@ class MockWalletClientDelegate : public WalletClientDelegate { class WalletClientTest : public testing::Test { public: - WalletClientTest() {} - virtual void SetUp() OVERRIDE { wallet_client_.reset( new WalletClient(browser_context_.GetRequestContext(), &delegate_)); @@ -772,6 +770,9 @@ class WalletClientTest : public testing::Test { return clean_upload_data; } + // The profile's request context must be released on the IO thread. + content::TestBrowserThreadBundle thread_bundle_; + net::TestURLFetcherFactory factory_; }; diff --git a/components/autofill/content/browser/wallet/wallet_service_url.cc b/components/autofill/content/browser/wallet/wallet_service_url.cc index bebdf7fe0d..e95a201a44 100644 --- a/components/autofill/content/browser/wallet/wallet_service_url.cc +++ b/components/autofill/content/browser/wallet/wallet_service_url.cc @@ -85,11 +85,11 @@ GURL GetGetFullWalletUrl() { } GURL GetManageInstrumentsUrl() { - return GetBaseSecureUrl().Resolve("manage/w/0/#paymentMethods:"); + return GetBaseSecureUrl().Resolve("manage/paymentMethods"); } GURL GetManageAddressesUrl() { - return GetBaseSecureUrl().Resolve("manage/w/0/#settings:addresses"); + return GetBaseSecureUrl().Resolve("manage/settings/addresses"); } GURL GetAcceptLegalDocumentsUrl() { diff --git a/components/autofill/content/browser/wallet/wallet_service_url_unittest.cc b/components/autofill/content/browser/wallet/wallet_service_url_unittest.cc index 793c95b2f9..3ed3600fc0 100644 --- a/components/autofill/content/browser/wallet/wallet_service_url_unittest.cc +++ b/components/autofill/content/browser/wallet/wallet_service_url_unittest.cc @@ -18,10 +18,9 @@ TEST(WalletServiceUrl, CheckDefaultUrls) { EXPECT_EQ("https://wallet-web.sandbox.google.com/online-secure/v2/" "autocheckout/v1/getFullWalletJwtless?s7e=otp", GetGetFullWalletUrl().spec()); - EXPECT_EQ("https://wallet-web.sandbox.google.com/manage/w/0/#paymentMethods:", + EXPECT_EQ("https://wallet-web.sandbox.google.com/manage/paymentMethods", GetManageInstrumentsUrl().spec()); - EXPECT_EQ("https://wallet-web.sandbox.google.com/manage/w/0/" - "#settings:addresses", + EXPECT_EQ("https://wallet-web.sandbox.google.com/manage/settings/addresses", GetManageAddressesUrl().spec()); EXPECT_EQ("https://payments-form-dogfood.sandbox.google.com/online/v2/wallet/" "autocheckout/v1/acceptLegalDocument", diff --git a/components/autofill/content/browser/wallet/wallet_signin_helper_unittest.cc b/components/autofill/content/browser/wallet/wallet_signin_helper_unittest.cc index a4f2bd9b77..c980fba00b 100644 --- a/components/autofill/content/browser/wallet/wallet_signin_helper_unittest.cc +++ b/components/autofill/content/browser/wallet/wallet_signin_helper_unittest.cc @@ -78,9 +78,7 @@ class WalletSigninHelperForTesting : public WalletSigninHelper { } // namespace class WalletSigninHelperTest : public testing::Test { - public: - WalletSigninHelperTest() {} - + protected: virtual void SetUp() OVERRIDE { signin_helper_.reset(new WalletSigninHelperForTesting( &mock_delegate_, @@ -92,7 +90,6 @@ class WalletSigninHelperTest : public testing::Test { signin_helper_.reset(); } - protected: // Sets up a response for the mock URLFetcher and completes the request. void SetUpFetcherResponseAndCompleteRequest( const std::string& url, @@ -158,8 +155,9 @@ class WalletSigninHelperTest : public testing::Test { content::TestBrowserContext browser_context_; private: - net::TestURLFetcherFactory factory_; + // The profile's request context must be released on the IO thread. content::TestBrowserThreadBundle thread_bundle_; + net::TestURLFetcherFactory factory_; }; TEST_F(WalletSigninHelperTest, PassiveSigninSuccessful) { diff --git a/components/autofill/core/browser/autofill_download_unittest.cc b/components/autofill/core/browser/autofill_download_unittest.cc index ec6bad1323..ed2c705e73 100644 --- a/components/autofill/core/browser/autofill_download_unittest.cc +++ b/components/autofill/core/browser/autofill_download_unittest.cc @@ -15,14 +15,13 @@ #include "components/autofill/core/browser/autofill_type.h" #include "components/autofill/core/browser/form_structure.h" #include "components/autofill/core/common/form_data.h" -#include "content/public/test/test_browser_thread.h" +#include "content/public/test/test_browser_thread_bundle.h" #include "net/url_request/test_url_fetcher_factory.h" #include "net/url_request/url_request_status.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/WebKit/public/web/WebInputElement.h" -using content::BrowserThread; using WebKit::WebInputElement; namespace autofill { @@ -65,18 +64,7 @@ class AutofillDownloadTest : public AutofillDownloadManager::Observer, public testing::Test { public: AutofillDownloadTest() - : download_manager_(&profile_, this), - io_thread_(BrowserThread::IO) { - } - - virtual void SetUp() { - io_thread_.StartIOThread(); - profile_.CreateRequestContext(); - } - - virtual void TearDown() { - profile_.ResetRequestContext(); - io_thread_.Stop(); + : download_manager_(&profile_, this) { } void LimitCache(size_t cache_size) { @@ -128,16 +116,12 @@ class AutofillDownloadTest : public AutofillDownloadManager::Observer, }; std::list<ResponseData> responses_; + content::TestBrowserThreadBundle thread_bundle_; TestingProfile profile_; AutofillDownloadManager download_manager_; - - private: - // The profile's request context must be released on the IO thread. - content::TestBrowserThread io_thread_; }; TEST_F(AutofillDownloadTest, QueryAndUploadTest) { - base::MessageLoopForUI message_loop; // Create and register factory. net::TestURLFetcherFactory factory; @@ -349,7 +333,6 @@ TEST_F(AutofillDownloadTest, QueryAndUploadTest) { } TEST_F(AutofillDownloadTest, CacheQueryTest) { - base::MessageLoopForUI message_loop; // Create and register factory. net::TestURLFetcherFactory factory; diff --git a/components/autofill/core/browser/autofill_manager_unittest.cc b/components/autofill/core/browser/autofill_manager_unittest.cc index d133cf3c5b..639d733edf 100644 --- a/components/autofill/core/browser/autofill_manager_unittest.cc +++ b/components/autofill/core/browser/autofill_manager_unittest.cc @@ -770,12 +770,6 @@ class AutofillManagerTest : public ChromeRenderViewHostTestHarness { personal_data_.SetBrowserContext(NULL); } - virtual content::BrowserContext* CreateBrowserContext() OVERRIDE { - TestingProfile* profile = new TestingProfile(); - profile->CreateRequestContext(); - return profile; - } - void GetAutofillSuggestions(int query_id, const FormData& form, const FormFieldData& field) { @@ -2082,7 +2076,7 @@ TEST_F(AutofillManagerTest, FillFormWithAuthorSpecifiedSections) { form.fields.push_back(field); test::CreateTestFormField("", "address", "", "text", &field); - field.autocomplete_attribute = "section-billing street-address"; + field.autocomplete_attribute = "section-billing address-line1"; form.fields.push_back(field); test::CreateTestFormField("", "city", "", "text", &field); diff --git a/components/autofill/core/browser/autofill_metrics_unittest.cc b/components/autofill/core/browser/autofill_metrics_unittest.cc index a5e58b598e..ce125fa6c2 100644 --- a/components/autofill/core/browser/autofill_metrics_unittest.cc +++ b/components/autofill/core/browser/autofill_metrics_unittest.cc @@ -287,7 +287,6 @@ void AutofillMetricsTest::SetUp() { // Ensure Mac OS X does not pop up a modal dialog for the Address Book. autofill::test::DisableSystemServices(profile()); - profile()->CreateRequestContext(); PersonalDataManagerFactory::GetInstance()->SetTestingFactory(profile(), NULL); TabAutofillManagerDelegate::CreateForWebContents(web_contents()); @@ -315,7 +314,6 @@ void AutofillMetricsTest::TearDown() { autofill_manager_.reset(); autofill_driver_.reset(); personal_data_.reset(); - profile()->ResetRequestContext(); ChromeRenderViewHostTestHarness::TearDown(); } @@ -810,7 +808,7 @@ TEST_F(AutofillMetricsTest, DeveloperEngagement) { field.autocomplete_attribute = "email"; forms.back().fields.push_back(field); test::CreateTestFormField("", "", "", "text", &field); - field.autocomplete_attribute = "street-address"; + field.autocomplete_attribute = "address-line1"; forms.back().fields.push_back(field); // Expect both the "form parsed" metric and the author-specified field type diff --git a/components/autofill/core/browser/form_structure.cc b/components/autofill/core/browser/form_structure.cc index ff3f84e548..0e97d98052 100644 --- a/components/autofill/core/browser/form_structure.cc +++ b/components/autofill/core/browser/form_structure.cc @@ -210,8 +210,7 @@ AutofillFieldType FieldTypeFromAutocompleteType( if (autocomplete_type == "organization") return COMPANY_NAME; - if (autocomplete_type == "street-address" || - autocomplete_type == "address-line1") + if (autocomplete_type == "address-line1") return ADDRESS_HOME_LINE1; if (autocomplete_type == "address-line2") diff --git a/components/autofill/core/browser/form_structure_unittest.cc b/components/autofill/core/browser/form_structure_unittest.cc index 995cfd3d14..0c787511a9 100644 --- a/components/autofill/core/browser/form_structure_unittest.cc +++ b/components/autofill/core/browser/form_structure_unittest.cc @@ -673,7 +673,7 @@ TEST(FormStructureTest, HeuristicsAutocompleteAttributeWithSectionsRepeated) { field.autocomplete_attribute = "section-foo email"; form.fields.push_back(field); - field.autocomplete_attribute = "section-foo street-address"; + field.autocomplete_attribute = "section-foo address-line1"; form.fields.push_back(field); FormStructure form_structure(form, std::string()); @@ -702,7 +702,7 @@ TEST(FormStructureTest, HeuristicsDontOverrideAutocompleteAttributeSections) { field.form_control_type = "text"; field.name = ASCIIToUTF16("one"); - field.autocomplete_attribute = "street-address"; + field.autocomplete_attribute = "address-line1"; form.fields.push_back(field); field.name = base::string16(); field.autocomplete_attribute = "section-foo email"; @@ -711,7 +711,7 @@ TEST(FormStructureTest, HeuristicsDontOverrideAutocompleteAttributeSections) { field.autocomplete_attribute = "name"; form.fields.push_back(field); field.name = ASCIIToUTF16("two"); - field.autocomplete_attribute = "street-address"; + field.autocomplete_attribute = "address-line1"; form.fields.push_back(field); FormStructure form_structure(form, std::string()); diff --git a/components/autofill_content_browser.target.darwin-arm.mk b/components/autofill_content_browser.target.darwin-arm.mk index dd5197b420..48f50bb950 100644 --- a/components/autofill_content_browser.target.darwin-arm.mk +++ b/components/autofill_content_browser.target.darwin-arm.mk @@ -13,7 +13,8 @@ gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) GYP_TARGET_DEPENDENCIES := \ $(call intermediates-dir-for,STATIC_LIBRARIES,components_autofill_content_risk_proto_gyp)/components_autofill_content_risk_proto_gyp.a \ $(call intermediates-dir-for,GYP,components_autofill_regexes_gyp)/autofill_regexes.stamp \ - $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_gyp)/skia_skia_gyp.a \ + $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \ + $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \ $(call intermediates-dir-for,GYP,third_party_icu_icui18n_gyp)/icui18n.stamp \ $(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp \ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libphonenumber_libphonenumber_without_metadata_gyp)/third_party_libphonenumber_libphonenumber_without_metadata_gyp.a \ @@ -93,20 +94,19 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ '-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER' \ - '-DSK_BUILD_NO_IMAGE_ENCODE' \ - '-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \ - '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ - '-DGR_AGGRESSIVE_SHADER_OPTS=1' \ '-DSK_ENABLE_INST_COUNT=0' \ - '-DSK_USE_POSIX_THREADS' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_BUILD_FOR_ANDROID' \ + '-DUSE_CHROMIUM_SKIA' \ + '-DSK_USE_POSIX_THREADS' \ '-DU_USING_ICU_NAMESPACE=0' \ '-DFEATURE_ENABLE_SSL' \ '-DFEATURE_ENABLE_VOICEMAIL' \ @@ -141,8 +141,8 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH)/third_party/protobuf \ $(LOCAL_PATH)/third_party/protobuf/src \ - $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/include/config \ $(LOCAL_PATH)/third_party/skia/include/core \ $(LOCAL_PATH)/third_party/skia/include/effects \ @@ -229,20 +229,19 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ '-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER' \ - '-DSK_BUILD_NO_IMAGE_ENCODE' \ - '-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \ - '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ - '-DGR_AGGRESSIVE_SHADER_OPTS=1' \ '-DSK_ENABLE_INST_COUNT=0' \ - '-DSK_USE_POSIX_THREADS' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_BUILD_FOR_ANDROID' \ + '-DUSE_CHROMIUM_SKIA' \ + '-DSK_USE_POSIX_THREADS' \ '-DU_USING_ICU_NAMESPACE=0' \ '-DFEATURE_ENABLE_SSL' \ '-DFEATURE_ENABLE_VOICEMAIL' \ @@ -278,8 +277,8 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH)/third_party/protobuf \ $(LOCAL_PATH)/third_party/protobuf/src \ - $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/include/config \ $(LOCAL_PATH)/third_party/skia/include/core \ $(LOCAL_PATH)/third_party/skia/include/effects \ @@ -366,7 +365,7 @@ LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) LOCAL_STATIC_LIBRARIES := \ components_autofill_content_risk_proto_gyp \ - skia_skia_gyp \ + skia_skia_library_gyp \ third_party_libphonenumber_libphonenumber_without_metadata_gyp \ ui_ui_gyp diff --git a/components/autofill_content_browser.target.darwin-mips.mk b/components/autofill_content_browser.target.darwin-mips.mk index 0ee4e98e00..9611d7761b 100644 --- a/components/autofill_content_browser.target.darwin-mips.mk +++ b/components/autofill_content_browser.target.darwin-mips.mk @@ -13,7 +13,8 @@ gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) GYP_TARGET_DEPENDENCIES := \ $(call intermediates-dir-for,STATIC_LIBRARIES,components_autofill_content_risk_proto_gyp)/components_autofill_content_risk_proto_gyp.a \ $(call intermediates-dir-for,GYP,components_autofill_regexes_gyp)/autofill_regexes.stamp \ - $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_gyp)/skia_skia_gyp.a \ + $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \ + $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \ $(call intermediates-dir-for,GYP,third_party_icu_icui18n_gyp)/icui18n.stamp \ $(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp \ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libphonenumber_libphonenumber_without_metadata_gyp)/third_party_libphonenumber_libphonenumber_without_metadata_gyp.a \ @@ -92,20 +93,19 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ '-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER' \ - '-DSK_BUILD_NO_IMAGE_ENCODE' \ - '-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \ - '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ - '-DGR_AGGRESSIVE_SHADER_OPTS=1' \ '-DSK_ENABLE_INST_COUNT=0' \ - '-DSK_USE_POSIX_THREADS' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_BUILD_FOR_ANDROID' \ + '-DUSE_CHROMIUM_SKIA' \ + '-DSK_USE_POSIX_THREADS' \ '-DU_USING_ICU_NAMESPACE=0' \ '-DFEATURE_ENABLE_SSL' \ '-DFEATURE_ENABLE_VOICEMAIL' \ @@ -140,8 +140,8 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH)/third_party/protobuf \ $(LOCAL_PATH)/third_party/protobuf/src \ - $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/include/config \ $(LOCAL_PATH)/third_party/skia/include/core \ $(LOCAL_PATH)/third_party/skia/include/effects \ @@ -227,20 +227,19 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ '-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER' \ - '-DSK_BUILD_NO_IMAGE_ENCODE' \ - '-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \ - '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ - '-DGR_AGGRESSIVE_SHADER_OPTS=1' \ '-DSK_ENABLE_INST_COUNT=0' \ - '-DSK_USE_POSIX_THREADS' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_BUILD_FOR_ANDROID' \ + '-DUSE_CHROMIUM_SKIA' \ + '-DSK_USE_POSIX_THREADS' \ '-DU_USING_ICU_NAMESPACE=0' \ '-DFEATURE_ENABLE_SSL' \ '-DFEATURE_ENABLE_VOICEMAIL' \ @@ -276,8 +275,8 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH)/third_party/protobuf \ $(LOCAL_PATH)/third_party/protobuf/src \ - $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/include/config \ $(LOCAL_PATH)/third_party/skia/include/core \ $(LOCAL_PATH)/third_party/skia/include/effects \ @@ -360,7 +359,7 @@ LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) LOCAL_STATIC_LIBRARIES := \ components_autofill_content_risk_proto_gyp \ - skia_skia_gyp \ + skia_skia_library_gyp \ third_party_libphonenumber_libphonenumber_without_metadata_gyp \ ui_ui_gyp diff --git a/components/autofill_content_browser.target.darwin-x86.mk b/components/autofill_content_browser.target.darwin-x86.mk index 47477515ff..4b0fd58b9e 100644 --- a/components/autofill_content_browser.target.darwin-x86.mk +++ b/components/autofill_content_browser.target.darwin-x86.mk @@ -13,7 +13,8 @@ gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) GYP_TARGET_DEPENDENCIES := \ $(call intermediates-dir-for,STATIC_LIBRARIES,components_autofill_content_risk_proto_gyp)/components_autofill_content_risk_proto_gyp.a \ $(call intermediates-dir-for,GYP,components_autofill_regexes_gyp)/autofill_regexes.stamp \ - $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_gyp)/skia_skia_gyp.a \ + $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \ + $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \ $(call intermediates-dir-for,GYP,third_party_icu_icui18n_gyp)/icui18n.stamp \ $(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp \ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libphonenumber_libphonenumber_without_metadata_gyp)/third_party_libphonenumber_libphonenumber_without_metadata_gyp.a \ @@ -95,20 +96,19 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ '-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER' \ - '-DSK_BUILD_NO_IMAGE_ENCODE' \ - '-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \ - '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ - '-DGR_AGGRESSIVE_SHADER_OPTS=1' \ '-DSK_ENABLE_INST_COUNT=0' \ - '-DSK_USE_POSIX_THREADS' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_BUILD_FOR_ANDROID' \ + '-DUSE_CHROMIUM_SKIA' \ + '-DSK_USE_POSIX_THREADS' \ '-DU_USING_ICU_NAMESPACE=0' \ '-DFEATURE_ENABLE_SSL' \ '-DFEATURE_ENABLE_VOICEMAIL' \ @@ -142,8 +142,8 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH)/third_party/protobuf \ $(LOCAL_PATH)/third_party/protobuf/src \ - $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/include/config \ $(LOCAL_PATH)/third_party/skia/include/core \ $(LOCAL_PATH)/third_party/skia/include/effects \ @@ -233,20 +233,19 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ '-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER' \ - '-DSK_BUILD_NO_IMAGE_ENCODE' \ - '-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \ - '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ - '-DGR_AGGRESSIVE_SHADER_OPTS=1' \ '-DSK_ENABLE_INST_COUNT=0' \ - '-DSK_USE_POSIX_THREADS' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_BUILD_FOR_ANDROID' \ + '-DUSE_CHROMIUM_SKIA' \ + '-DSK_USE_POSIX_THREADS' \ '-DU_USING_ICU_NAMESPACE=0' \ '-DFEATURE_ENABLE_SSL' \ '-DFEATURE_ENABLE_VOICEMAIL' \ @@ -281,8 +280,8 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH)/third_party/protobuf \ $(LOCAL_PATH)/third_party/protobuf/src \ - $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/include/config \ $(LOCAL_PATH)/third_party/skia/include/core \ $(LOCAL_PATH)/third_party/skia/include/effects \ @@ -364,7 +363,7 @@ LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) LOCAL_STATIC_LIBRARIES := \ components_autofill_content_risk_proto_gyp \ - skia_skia_gyp \ + skia_skia_library_gyp \ third_party_libphonenumber_libphonenumber_without_metadata_gyp \ ui_ui_gyp diff --git a/components/autofill_content_browser.target.linux-arm.mk b/components/autofill_content_browser.target.linux-arm.mk index dd5197b420..48f50bb950 100644 --- a/components/autofill_content_browser.target.linux-arm.mk +++ b/components/autofill_content_browser.target.linux-arm.mk @@ -13,7 +13,8 @@ gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) GYP_TARGET_DEPENDENCIES := \ $(call intermediates-dir-for,STATIC_LIBRARIES,components_autofill_content_risk_proto_gyp)/components_autofill_content_risk_proto_gyp.a \ $(call intermediates-dir-for,GYP,components_autofill_regexes_gyp)/autofill_regexes.stamp \ - $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_gyp)/skia_skia_gyp.a \ + $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \ + $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \ $(call intermediates-dir-for,GYP,third_party_icu_icui18n_gyp)/icui18n.stamp \ $(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp \ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libphonenumber_libphonenumber_without_metadata_gyp)/third_party_libphonenumber_libphonenumber_without_metadata_gyp.a \ @@ -93,20 +94,19 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ '-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER' \ - '-DSK_BUILD_NO_IMAGE_ENCODE' \ - '-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \ - '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ - '-DGR_AGGRESSIVE_SHADER_OPTS=1' \ '-DSK_ENABLE_INST_COUNT=0' \ - '-DSK_USE_POSIX_THREADS' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_BUILD_FOR_ANDROID' \ + '-DUSE_CHROMIUM_SKIA' \ + '-DSK_USE_POSIX_THREADS' \ '-DU_USING_ICU_NAMESPACE=0' \ '-DFEATURE_ENABLE_SSL' \ '-DFEATURE_ENABLE_VOICEMAIL' \ @@ -141,8 +141,8 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH)/third_party/protobuf \ $(LOCAL_PATH)/third_party/protobuf/src \ - $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/include/config \ $(LOCAL_PATH)/third_party/skia/include/core \ $(LOCAL_PATH)/third_party/skia/include/effects \ @@ -229,20 +229,19 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ '-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER' \ - '-DSK_BUILD_NO_IMAGE_ENCODE' \ - '-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \ - '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ - '-DGR_AGGRESSIVE_SHADER_OPTS=1' \ '-DSK_ENABLE_INST_COUNT=0' \ - '-DSK_USE_POSIX_THREADS' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_BUILD_FOR_ANDROID' \ + '-DUSE_CHROMIUM_SKIA' \ + '-DSK_USE_POSIX_THREADS' \ '-DU_USING_ICU_NAMESPACE=0' \ '-DFEATURE_ENABLE_SSL' \ '-DFEATURE_ENABLE_VOICEMAIL' \ @@ -278,8 +277,8 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH)/third_party/protobuf \ $(LOCAL_PATH)/third_party/protobuf/src \ - $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/include/config \ $(LOCAL_PATH)/third_party/skia/include/core \ $(LOCAL_PATH)/third_party/skia/include/effects \ @@ -366,7 +365,7 @@ LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) LOCAL_STATIC_LIBRARIES := \ components_autofill_content_risk_proto_gyp \ - skia_skia_gyp \ + skia_skia_library_gyp \ third_party_libphonenumber_libphonenumber_without_metadata_gyp \ ui_ui_gyp diff --git a/components/autofill_content_browser.target.linux-mips.mk b/components/autofill_content_browser.target.linux-mips.mk index 0ee4e98e00..9611d7761b 100644 --- a/components/autofill_content_browser.target.linux-mips.mk +++ b/components/autofill_content_browser.target.linux-mips.mk @@ -13,7 +13,8 @@ gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) GYP_TARGET_DEPENDENCIES := \ $(call intermediates-dir-for,STATIC_LIBRARIES,components_autofill_content_risk_proto_gyp)/components_autofill_content_risk_proto_gyp.a \ $(call intermediates-dir-for,GYP,components_autofill_regexes_gyp)/autofill_regexes.stamp \ - $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_gyp)/skia_skia_gyp.a \ + $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \ + $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \ $(call intermediates-dir-for,GYP,third_party_icu_icui18n_gyp)/icui18n.stamp \ $(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp \ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libphonenumber_libphonenumber_without_metadata_gyp)/third_party_libphonenumber_libphonenumber_without_metadata_gyp.a \ @@ -92,20 +93,19 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ '-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER' \ - '-DSK_BUILD_NO_IMAGE_ENCODE' \ - '-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \ - '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ - '-DGR_AGGRESSIVE_SHADER_OPTS=1' \ '-DSK_ENABLE_INST_COUNT=0' \ - '-DSK_USE_POSIX_THREADS' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_BUILD_FOR_ANDROID' \ + '-DUSE_CHROMIUM_SKIA' \ + '-DSK_USE_POSIX_THREADS' \ '-DU_USING_ICU_NAMESPACE=0' \ '-DFEATURE_ENABLE_SSL' \ '-DFEATURE_ENABLE_VOICEMAIL' \ @@ -140,8 +140,8 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH)/third_party/protobuf \ $(LOCAL_PATH)/third_party/protobuf/src \ - $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/include/config \ $(LOCAL_PATH)/third_party/skia/include/core \ $(LOCAL_PATH)/third_party/skia/include/effects \ @@ -227,20 +227,19 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ '-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER' \ - '-DSK_BUILD_NO_IMAGE_ENCODE' \ - '-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \ - '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ - '-DGR_AGGRESSIVE_SHADER_OPTS=1' \ '-DSK_ENABLE_INST_COUNT=0' \ - '-DSK_USE_POSIX_THREADS' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_BUILD_FOR_ANDROID' \ + '-DUSE_CHROMIUM_SKIA' \ + '-DSK_USE_POSIX_THREADS' \ '-DU_USING_ICU_NAMESPACE=0' \ '-DFEATURE_ENABLE_SSL' \ '-DFEATURE_ENABLE_VOICEMAIL' \ @@ -276,8 +275,8 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH)/third_party/protobuf \ $(LOCAL_PATH)/third_party/protobuf/src \ - $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/include/config \ $(LOCAL_PATH)/third_party/skia/include/core \ $(LOCAL_PATH)/third_party/skia/include/effects \ @@ -360,7 +359,7 @@ LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) LOCAL_STATIC_LIBRARIES := \ components_autofill_content_risk_proto_gyp \ - skia_skia_gyp \ + skia_skia_library_gyp \ third_party_libphonenumber_libphonenumber_without_metadata_gyp \ ui_ui_gyp diff --git a/components/autofill_content_browser.target.linux-x86.mk b/components/autofill_content_browser.target.linux-x86.mk index 47477515ff..4b0fd58b9e 100644 --- a/components/autofill_content_browser.target.linux-x86.mk +++ b/components/autofill_content_browser.target.linux-x86.mk @@ -13,7 +13,8 @@ gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) GYP_TARGET_DEPENDENCIES := \ $(call intermediates-dir-for,STATIC_LIBRARIES,components_autofill_content_risk_proto_gyp)/components_autofill_content_risk_proto_gyp.a \ $(call intermediates-dir-for,GYP,components_autofill_regexes_gyp)/autofill_regexes.stamp \ - $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_gyp)/skia_skia_gyp.a \ + $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \ + $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \ $(call intermediates-dir-for,GYP,third_party_icu_icui18n_gyp)/icui18n.stamp \ $(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp \ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libphonenumber_libphonenumber_without_metadata_gyp)/third_party_libphonenumber_libphonenumber_without_metadata_gyp.a \ @@ -95,20 +96,19 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ '-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER' \ - '-DSK_BUILD_NO_IMAGE_ENCODE' \ - '-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \ - '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ - '-DGR_AGGRESSIVE_SHADER_OPTS=1' \ '-DSK_ENABLE_INST_COUNT=0' \ - '-DSK_USE_POSIX_THREADS' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_BUILD_FOR_ANDROID' \ + '-DUSE_CHROMIUM_SKIA' \ + '-DSK_USE_POSIX_THREADS' \ '-DU_USING_ICU_NAMESPACE=0' \ '-DFEATURE_ENABLE_SSL' \ '-DFEATURE_ENABLE_VOICEMAIL' \ @@ -142,8 +142,8 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH)/third_party/protobuf \ $(LOCAL_PATH)/third_party/protobuf/src \ - $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/include/config \ $(LOCAL_PATH)/third_party/skia/include/core \ $(LOCAL_PATH)/third_party/skia/include/effects \ @@ -233,20 +233,19 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ '-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER' \ - '-DSK_BUILD_NO_IMAGE_ENCODE' \ - '-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \ - '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ - '-DGR_AGGRESSIVE_SHADER_OPTS=1' \ '-DSK_ENABLE_INST_COUNT=0' \ - '-DSK_USE_POSIX_THREADS' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_BUILD_FOR_ANDROID' \ + '-DUSE_CHROMIUM_SKIA' \ + '-DSK_USE_POSIX_THREADS' \ '-DU_USING_ICU_NAMESPACE=0' \ '-DFEATURE_ENABLE_SSL' \ '-DFEATURE_ENABLE_VOICEMAIL' \ @@ -281,8 +280,8 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH)/third_party/protobuf \ $(LOCAL_PATH)/third_party/protobuf/src \ - $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/include/config \ $(LOCAL_PATH)/third_party/skia/include/core \ $(LOCAL_PATH)/third_party/skia/include/effects \ @@ -364,7 +363,7 @@ LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) LOCAL_STATIC_LIBRARIES := \ components_autofill_content_risk_proto_gyp \ - skia_skia_gyp \ + skia_skia_library_gyp \ third_party_libphonenumber_libphonenumber_without_metadata_gyp \ ui_ui_gyp diff --git a/components/autofill_content_renderer.target.darwin-arm.mk b/components/autofill_content_renderer.target.darwin-arm.mk index 07164328ad..bfcf758dd2 100644 --- a/components/autofill_content_renderer.target.darwin-arm.mk +++ b/components/autofill_content_renderer.target.darwin-arm.mk @@ -11,7 +11,8 @@ gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := \ - $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_gyp)/skia_skia_gyp.a \ + $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \ + $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \ $(call intermediates-dir-for,GYP,components_component_strings_gyp)/component_strings.stamp GYP_GENERATED_OUTPUTS := @@ -76,17 +77,16 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ - '-DSK_BUILD_NO_IMAGE_ENCODE' \ - '-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \ - '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ - '-DGR_AGGRESSIVE_SHADER_OPTS=1' \ '-DSK_ENABLE_INST_COUNT=0' \ - '-DSK_USE_POSIX_THREADS' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_BUILD_FOR_ANDROID' \ + '-DUSE_CHROMIUM_SKIA' \ + '-DSK_USE_POSIX_THREADS' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -107,8 +107,8 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH)/third_party/khronos \ $(LOCAL_PATH)/gpu \ - $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/include/config \ $(LOCAL_PATH)/third_party/skia/include/core \ $(LOCAL_PATH)/third_party/skia/include/effects \ @@ -182,17 +182,16 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ - '-DSK_BUILD_NO_IMAGE_ENCODE' \ - '-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \ - '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ - '-DGR_AGGRESSIVE_SHADER_OPTS=1' \ '-DSK_ENABLE_INST_COUNT=0' \ - '-DSK_USE_POSIX_THREADS' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_BUILD_FOR_ANDROID' \ + '-DUSE_CHROMIUM_SKIA' \ + '-DSK_USE_POSIX_THREADS' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -214,8 +213,8 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH)/third_party/khronos \ $(LOCAL_PATH)/gpu \ - $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/include/config \ $(LOCAL_PATH)/third_party/skia/include/core \ $(LOCAL_PATH)/third_party/skia/include/effects \ @@ -288,7 +287,7 @@ LOCAL_LDFLAGS_Release := \ LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) LOCAL_STATIC_LIBRARIES := \ - skia_skia_gyp + skia_skia_library_gyp # Enable grouping to fix circular references LOCAL_GROUP_STATIC_LIBRARIES := true diff --git a/components/autofill_content_renderer.target.darwin-mips.mk b/components/autofill_content_renderer.target.darwin-mips.mk index a9b1d4c52c..6844cd6591 100644 --- a/components/autofill_content_renderer.target.darwin-mips.mk +++ b/components/autofill_content_renderer.target.darwin-mips.mk @@ -11,7 +11,8 @@ gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := \ - $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_gyp)/skia_skia_gyp.a \ + $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \ + $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \ $(call intermediates-dir-for,GYP,components_component_strings_gyp)/component_strings.stamp GYP_GENERATED_OUTPUTS := @@ -75,17 +76,16 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ - '-DSK_BUILD_NO_IMAGE_ENCODE' \ - '-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \ - '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ - '-DGR_AGGRESSIVE_SHADER_OPTS=1' \ '-DSK_ENABLE_INST_COUNT=0' \ - '-DSK_USE_POSIX_THREADS' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_BUILD_FOR_ANDROID' \ + '-DUSE_CHROMIUM_SKIA' \ + '-DSK_USE_POSIX_THREADS' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -106,8 +106,8 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH)/third_party/khronos \ $(LOCAL_PATH)/gpu \ - $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/include/config \ $(LOCAL_PATH)/third_party/skia/include/core \ $(LOCAL_PATH)/third_party/skia/include/effects \ @@ -180,17 +180,16 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ - '-DSK_BUILD_NO_IMAGE_ENCODE' \ - '-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \ - '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ - '-DGR_AGGRESSIVE_SHADER_OPTS=1' \ '-DSK_ENABLE_INST_COUNT=0' \ - '-DSK_USE_POSIX_THREADS' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_BUILD_FOR_ANDROID' \ + '-DUSE_CHROMIUM_SKIA' \ + '-DSK_USE_POSIX_THREADS' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -212,8 +211,8 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH)/third_party/khronos \ $(LOCAL_PATH)/gpu \ - $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/include/config \ $(LOCAL_PATH)/third_party/skia/include/core \ $(LOCAL_PATH)/third_party/skia/include/effects \ @@ -282,7 +281,7 @@ LOCAL_LDFLAGS_Release := \ LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) LOCAL_STATIC_LIBRARIES := \ - skia_skia_gyp + skia_skia_library_gyp # Enable grouping to fix circular references LOCAL_GROUP_STATIC_LIBRARIES := true diff --git a/components/autofill_content_renderer.target.darwin-x86.mk b/components/autofill_content_renderer.target.darwin-x86.mk index 743b3f8bfb..fe4d57e750 100644 --- a/components/autofill_content_renderer.target.darwin-x86.mk +++ b/components/autofill_content_renderer.target.darwin-x86.mk @@ -11,7 +11,8 @@ gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := \ - $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_gyp)/skia_skia_gyp.a \ + $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \ + $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \ $(call intermediates-dir-for,GYP,components_component_strings_gyp)/component_strings.stamp GYP_GENERATED_OUTPUTS := @@ -78,17 +79,16 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ - '-DSK_BUILD_NO_IMAGE_ENCODE' \ - '-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \ - '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ - '-DGR_AGGRESSIVE_SHADER_OPTS=1' \ '-DSK_ENABLE_INST_COUNT=0' \ - '-DSK_USE_POSIX_THREADS' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_BUILD_FOR_ANDROID' \ + '-DUSE_CHROMIUM_SKIA' \ + '-DSK_USE_POSIX_THREADS' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -109,8 +109,8 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH)/third_party/khronos \ $(LOCAL_PATH)/gpu \ - $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/include/config \ $(LOCAL_PATH)/third_party/skia/include/core \ $(LOCAL_PATH)/third_party/skia/include/effects \ @@ -187,17 +187,16 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ - '-DSK_BUILD_NO_IMAGE_ENCODE' \ - '-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \ - '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ - '-DGR_AGGRESSIVE_SHADER_OPTS=1' \ '-DSK_ENABLE_INST_COUNT=0' \ - '-DSK_USE_POSIX_THREADS' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_BUILD_FOR_ANDROID' \ + '-DUSE_CHROMIUM_SKIA' \ + '-DSK_USE_POSIX_THREADS' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -219,8 +218,8 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH)/third_party/khronos \ $(LOCAL_PATH)/gpu \ - $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/include/config \ $(LOCAL_PATH)/third_party/skia/include/core \ $(LOCAL_PATH)/third_party/skia/include/effects \ @@ -288,7 +287,7 @@ LOCAL_LDFLAGS_Release := \ LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) LOCAL_STATIC_LIBRARIES := \ - skia_skia_gyp + skia_skia_library_gyp # Enable grouping to fix circular references LOCAL_GROUP_STATIC_LIBRARIES := true diff --git a/components/autofill_content_renderer.target.linux-arm.mk b/components/autofill_content_renderer.target.linux-arm.mk index 07164328ad..bfcf758dd2 100644 --- a/components/autofill_content_renderer.target.linux-arm.mk +++ b/components/autofill_content_renderer.target.linux-arm.mk @@ -11,7 +11,8 @@ gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := \ - $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_gyp)/skia_skia_gyp.a \ + $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \ + $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \ $(call intermediates-dir-for,GYP,components_component_strings_gyp)/component_strings.stamp GYP_GENERATED_OUTPUTS := @@ -76,17 +77,16 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ - '-DSK_BUILD_NO_IMAGE_ENCODE' \ - '-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \ - '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ - '-DGR_AGGRESSIVE_SHADER_OPTS=1' \ '-DSK_ENABLE_INST_COUNT=0' \ - '-DSK_USE_POSIX_THREADS' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_BUILD_FOR_ANDROID' \ + '-DUSE_CHROMIUM_SKIA' \ + '-DSK_USE_POSIX_THREADS' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -107,8 +107,8 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH)/third_party/khronos \ $(LOCAL_PATH)/gpu \ - $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/include/config \ $(LOCAL_PATH)/third_party/skia/include/core \ $(LOCAL_PATH)/third_party/skia/include/effects \ @@ -182,17 +182,16 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ - '-DSK_BUILD_NO_IMAGE_ENCODE' \ - '-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \ - '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ - '-DGR_AGGRESSIVE_SHADER_OPTS=1' \ '-DSK_ENABLE_INST_COUNT=0' \ - '-DSK_USE_POSIX_THREADS' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_BUILD_FOR_ANDROID' \ + '-DUSE_CHROMIUM_SKIA' \ + '-DSK_USE_POSIX_THREADS' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -214,8 +213,8 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH)/third_party/khronos \ $(LOCAL_PATH)/gpu \ - $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/include/config \ $(LOCAL_PATH)/third_party/skia/include/core \ $(LOCAL_PATH)/third_party/skia/include/effects \ @@ -288,7 +287,7 @@ LOCAL_LDFLAGS_Release := \ LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) LOCAL_STATIC_LIBRARIES := \ - skia_skia_gyp + skia_skia_library_gyp # Enable grouping to fix circular references LOCAL_GROUP_STATIC_LIBRARIES := true diff --git a/components/autofill_content_renderer.target.linux-mips.mk b/components/autofill_content_renderer.target.linux-mips.mk index a9b1d4c52c..6844cd6591 100644 --- a/components/autofill_content_renderer.target.linux-mips.mk +++ b/components/autofill_content_renderer.target.linux-mips.mk @@ -11,7 +11,8 @@ gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := \ - $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_gyp)/skia_skia_gyp.a \ + $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \ + $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \ $(call intermediates-dir-for,GYP,components_component_strings_gyp)/component_strings.stamp GYP_GENERATED_OUTPUTS := @@ -75,17 +76,16 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ - '-DSK_BUILD_NO_IMAGE_ENCODE' \ - '-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \ - '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ - '-DGR_AGGRESSIVE_SHADER_OPTS=1' \ '-DSK_ENABLE_INST_COUNT=0' \ - '-DSK_USE_POSIX_THREADS' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_BUILD_FOR_ANDROID' \ + '-DUSE_CHROMIUM_SKIA' \ + '-DSK_USE_POSIX_THREADS' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -106,8 +106,8 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH)/third_party/khronos \ $(LOCAL_PATH)/gpu \ - $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/include/config \ $(LOCAL_PATH)/third_party/skia/include/core \ $(LOCAL_PATH)/third_party/skia/include/effects \ @@ -180,17 +180,16 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ - '-DSK_BUILD_NO_IMAGE_ENCODE' \ - '-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \ - '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ - '-DGR_AGGRESSIVE_SHADER_OPTS=1' \ '-DSK_ENABLE_INST_COUNT=0' \ - '-DSK_USE_POSIX_THREADS' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_BUILD_FOR_ANDROID' \ + '-DUSE_CHROMIUM_SKIA' \ + '-DSK_USE_POSIX_THREADS' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -212,8 +211,8 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH)/third_party/khronos \ $(LOCAL_PATH)/gpu \ - $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/include/config \ $(LOCAL_PATH)/third_party/skia/include/core \ $(LOCAL_PATH)/third_party/skia/include/effects \ @@ -282,7 +281,7 @@ LOCAL_LDFLAGS_Release := \ LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) LOCAL_STATIC_LIBRARIES := \ - skia_skia_gyp + skia_skia_library_gyp # Enable grouping to fix circular references LOCAL_GROUP_STATIC_LIBRARIES := true diff --git a/components/autofill_content_renderer.target.linux-x86.mk b/components/autofill_content_renderer.target.linux-x86.mk index 743b3f8bfb..fe4d57e750 100644 --- a/components/autofill_content_renderer.target.linux-x86.mk +++ b/components/autofill_content_renderer.target.linux-x86.mk @@ -11,7 +11,8 @@ gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := \ - $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_gyp)/skia_skia_gyp.a \ + $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \ + $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \ $(call intermediates-dir-for,GYP,components_component_strings_gyp)/component_strings.stamp GYP_GENERATED_OUTPUTS := @@ -78,17 +79,16 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ - '-DSK_BUILD_NO_IMAGE_ENCODE' \ - '-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \ - '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ - '-DGR_AGGRESSIVE_SHADER_OPTS=1' \ '-DSK_ENABLE_INST_COUNT=0' \ - '-DSK_USE_POSIX_THREADS' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_BUILD_FOR_ANDROID' \ + '-DUSE_CHROMIUM_SKIA' \ + '-DSK_USE_POSIX_THREADS' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -109,8 +109,8 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH)/third_party/khronos \ $(LOCAL_PATH)/gpu \ - $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/include/config \ $(LOCAL_PATH)/third_party/skia/include/core \ $(LOCAL_PATH)/third_party/skia/include/effects \ @@ -187,17 +187,16 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ - '-DSK_BUILD_NO_IMAGE_ENCODE' \ - '-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \ - '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ - '-DGR_AGGRESSIVE_SHADER_OPTS=1' \ '-DSK_ENABLE_INST_COUNT=0' \ - '-DSK_USE_POSIX_THREADS' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_BUILD_FOR_ANDROID' \ + '-DUSE_CHROMIUM_SKIA' \ + '-DSK_USE_POSIX_THREADS' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -219,8 +218,8 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH)/third_party/khronos \ $(LOCAL_PATH)/gpu \ - $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/include/config \ $(LOCAL_PATH)/third_party/skia/include/core \ $(LOCAL_PATH)/third_party/skia/include/effects \ @@ -288,7 +287,7 @@ LOCAL_LDFLAGS_Release := \ LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) LOCAL_STATIC_LIBRARIES := \ - skia_skia_gyp + skia_skia_library_gyp # Enable grouping to fix circular references LOCAL_GROUP_STATIC_LIBRARIES := true diff --git a/components/autofill_content_risk_proto.target.darwin-arm.mk b/components/autofill_content_risk_proto.target.darwin-arm.mk index 84b2f205cc..60a60555b0 100644 --- a/components/autofill_content_risk_proto.target.darwin-arm.mk +++ b/components/autofill_content_risk_proto.target.darwin-arm.mk @@ -96,10 +96,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ '-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER' \ @@ -181,10 +181,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ '-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER' \ diff --git a/components/autofill_content_risk_proto.target.darwin-mips.mk b/components/autofill_content_risk_proto.target.darwin-mips.mk index 770292bdd8..2f036d2701 100644 --- a/components/autofill_content_risk_proto.target.darwin-mips.mk +++ b/components/autofill_content_risk_proto.target.darwin-mips.mk @@ -95,10 +95,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ '-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER' \ @@ -179,10 +179,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ '-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER' \ diff --git a/components/autofill_content_risk_proto.target.darwin-x86.mk b/components/autofill_content_risk_proto.target.darwin-x86.mk index 10afef42dc..67f1395456 100644 --- a/components/autofill_content_risk_proto.target.darwin-x86.mk +++ b/components/autofill_content_risk_proto.target.darwin-x86.mk @@ -98,10 +98,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ '-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER' \ @@ -186,10 +186,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ '-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER' \ diff --git a/components/autofill_content_risk_proto.target.linux-arm.mk b/components/autofill_content_risk_proto.target.linux-arm.mk index 84b2f205cc..60a60555b0 100644 --- a/components/autofill_content_risk_proto.target.linux-arm.mk +++ b/components/autofill_content_risk_proto.target.linux-arm.mk @@ -96,10 +96,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ '-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER' \ @@ -181,10 +181,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ '-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER' \ diff --git a/components/autofill_content_risk_proto.target.linux-mips.mk b/components/autofill_content_risk_proto.target.linux-mips.mk index 770292bdd8..2f036d2701 100644 --- a/components/autofill_content_risk_proto.target.linux-mips.mk +++ b/components/autofill_content_risk_proto.target.linux-mips.mk @@ -95,10 +95,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ '-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER' \ @@ -179,10 +179,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ '-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER' \ diff --git a/components/autofill_content_risk_proto.target.linux-x86.mk b/components/autofill_content_risk_proto.target.linux-x86.mk index 10afef42dc..67f1395456 100644 --- a/components/autofill_content_risk_proto.target.linux-x86.mk +++ b/components/autofill_content_risk_proto.target.linux-x86.mk @@ -98,10 +98,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ '-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER' \ @@ -186,10 +186,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ '-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER' \ diff --git a/components/autofill_core_browser.target.darwin-arm.mk b/components/autofill_core_browser.target.darwin-arm.mk index be2b5ce72f..973f381b79 100644 --- a/components/autofill_core_browser.target.darwin-arm.mk +++ b/components/autofill_core_browser.target.darwin-arm.mk @@ -12,7 +12,8 @@ gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := \ $(call intermediates-dir-for,GYP,components_autofill_regexes_gyp)/autofill_regexes.stamp \ - $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_gyp)/skia_skia_gyp.a \ + $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \ + $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \ $(call intermediates-dir-for,GYP,third_party_icu_icui18n_gyp)/icui18n.stamp \ $(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp \ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libphonenumber_libphonenumber_without_metadata_gyp)/third_party_libphonenumber_libphonenumber_without_metadata_gyp.a \ @@ -117,17 +118,16 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ - '-DSK_BUILD_NO_IMAGE_ENCODE' \ - '-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \ - '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ - '-DGR_AGGRESSIVE_SHADER_OPTS=1' \ '-DSK_ENABLE_INST_COUNT=0' \ - '-DSK_USE_POSIX_THREADS' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_BUILD_FOR_ANDROID' \ + '-DUSE_CHROMIUM_SKIA' \ + '-DSK_USE_POSIX_THREADS' \ '-DU_USING_ICU_NAMESPACE=0' \ '-DFEATURE_ENABLE_SSL' \ '-DFEATURE_ENABLE_VOICEMAIL' \ @@ -162,8 +162,8 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH)/third_party/khronos \ $(LOCAL_PATH)/gpu \ - $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/include/config \ $(LOCAL_PATH)/third_party/skia/include/core \ $(LOCAL_PATH)/third_party/skia/include/effects \ @@ -253,17 +253,16 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ - '-DSK_BUILD_NO_IMAGE_ENCODE' \ - '-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \ - '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ - '-DGR_AGGRESSIVE_SHADER_OPTS=1' \ '-DSK_ENABLE_INST_COUNT=0' \ - '-DSK_USE_POSIX_THREADS' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_BUILD_FOR_ANDROID' \ + '-DUSE_CHROMIUM_SKIA' \ + '-DSK_USE_POSIX_THREADS' \ '-DU_USING_ICU_NAMESPACE=0' \ '-DFEATURE_ENABLE_SSL' \ '-DFEATURE_ENABLE_VOICEMAIL' \ @@ -299,8 +298,8 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH)/third_party/khronos \ $(LOCAL_PATH)/gpu \ - $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/include/config \ $(LOCAL_PATH)/third_party/skia/include/core \ $(LOCAL_PATH)/third_party/skia/include/effects \ @@ -389,7 +388,7 @@ LOCAL_LDFLAGS_Release := \ LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) LOCAL_STATIC_LIBRARIES := \ - skia_skia_gyp \ + skia_skia_library_gyp \ third_party_libphonenumber_libphonenumber_without_metadata_gyp \ ui_ui_gyp diff --git a/components/autofill_core_browser.target.darwin-mips.mk b/components/autofill_core_browser.target.darwin-mips.mk index 3897b86d03..c19dde6de4 100644 --- a/components/autofill_core_browser.target.darwin-mips.mk +++ b/components/autofill_core_browser.target.darwin-mips.mk @@ -12,7 +12,8 @@ gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := \ $(call intermediates-dir-for,GYP,components_autofill_regexes_gyp)/autofill_regexes.stamp \ - $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_gyp)/skia_skia_gyp.a \ + $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \ + $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \ $(call intermediates-dir-for,GYP,third_party_icu_icui18n_gyp)/icui18n.stamp \ $(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp \ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libphonenumber_libphonenumber_without_metadata_gyp)/third_party_libphonenumber_libphonenumber_without_metadata_gyp.a \ @@ -116,17 +117,16 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ - '-DSK_BUILD_NO_IMAGE_ENCODE' \ - '-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \ - '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ - '-DGR_AGGRESSIVE_SHADER_OPTS=1' \ '-DSK_ENABLE_INST_COUNT=0' \ - '-DSK_USE_POSIX_THREADS' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_BUILD_FOR_ANDROID' \ + '-DUSE_CHROMIUM_SKIA' \ + '-DSK_USE_POSIX_THREADS' \ '-DU_USING_ICU_NAMESPACE=0' \ '-DFEATURE_ENABLE_SSL' \ '-DFEATURE_ENABLE_VOICEMAIL' \ @@ -161,8 +161,8 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH)/third_party/khronos \ $(LOCAL_PATH)/gpu \ - $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/include/config \ $(LOCAL_PATH)/third_party/skia/include/core \ $(LOCAL_PATH)/third_party/skia/include/effects \ @@ -251,17 +251,16 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ - '-DSK_BUILD_NO_IMAGE_ENCODE' \ - '-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \ - '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ - '-DGR_AGGRESSIVE_SHADER_OPTS=1' \ '-DSK_ENABLE_INST_COUNT=0' \ - '-DSK_USE_POSIX_THREADS' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_BUILD_FOR_ANDROID' \ + '-DUSE_CHROMIUM_SKIA' \ + '-DSK_USE_POSIX_THREADS' \ '-DU_USING_ICU_NAMESPACE=0' \ '-DFEATURE_ENABLE_SSL' \ '-DFEATURE_ENABLE_VOICEMAIL' \ @@ -297,8 +296,8 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH)/third_party/khronos \ $(LOCAL_PATH)/gpu \ - $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/include/config \ $(LOCAL_PATH)/third_party/skia/include/core \ $(LOCAL_PATH)/third_party/skia/include/effects \ @@ -383,7 +382,7 @@ LOCAL_LDFLAGS_Release := \ LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) LOCAL_STATIC_LIBRARIES := \ - skia_skia_gyp \ + skia_skia_library_gyp \ third_party_libphonenumber_libphonenumber_without_metadata_gyp \ ui_ui_gyp diff --git a/components/autofill_core_browser.target.darwin-x86.mk b/components/autofill_core_browser.target.darwin-x86.mk index 337d66f94f..1b3a9193d2 100644 --- a/components/autofill_core_browser.target.darwin-x86.mk +++ b/components/autofill_core_browser.target.darwin-x86.mk @@ -12,7 +12,8 @@ gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := \ $(call intermediates-dir-for,GYP,components_autofill_regexes_gyp)/autofill_regexes.stamp \ - $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_gyp)/skia_skia_gyp.a \ + $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \ + $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \ $(call intermediates-dir-for,GYP,third_party_icu_icui18n_gyp)/icui18n.stamp \ $(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp \ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libphonenumber_libphonenumber_without_metadata_gyp)/third_party_libphonenumber_libphonenumber_without_metadata_gyp.a \ @@ -119,17 +120,16 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ - '-DSK_BUILD_NO_IMAGE_ENCODE' \ - '-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \ - '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ - '-DGR_AGGRESSIVE_SHADER_OPTS=1' \ '-DSK_ENABLE_INST_COUNT=0' \ - '-DSK_USE_POSIX_THREADS' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_BUILD_FOR_ANDROID' \ + '-DUSE_CHROMIUM_SKIA' \ + '-DSK_USE_POSIX_THREADS' \ '-DU_USING_ICU_NAMESPACE=0' \ '-DFEATURE_ENABLE_SSL' \ '-DFEATURE_ENABLE_VOICEMAIL' \ @@ -163,8 +163,8 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH)/third_party/khronos \ $(LOCAL_PATH)/gpu \ - $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/include/config \ $(LOCAL_PATH)/third_party/skia/include/core \ $(LOCAL_PATH)/third_party/skia/include/effects \ @@ -257,17 +257,16 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ - '-DSK_BUILD_NO_IMAGE_ENCODE' \ - '-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \ - '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ - '-DGR_AGGRESSIVE_SHADER_OPTS=1' \ '-DSK_ENABLE_INST_COUNT=0' \ - '-DSK_USE_POSIX_THREADS' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_BUILD_FOR_ANDROID' \ + '-DUSE_CHROMIUM_SKIA' \ + '-DSK_USE_POSIX_THREADS' \ '-DU_USING_ICU_NAMESPACE=0' \ '-DFEATURE_ENABLE_SSL' \ '-DFEATURE_ENABLE_VOICEMAIL' \ @@ -302,8 +301,8 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH)/third_party/khronos \ $(LOCAL_PATH)/gpu \ - $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/include/config \ $(LOCAL_PATH)/third_party/skia/include/core \ $(LOCAL_PATH)/third_party/skia/include/effects \ @@ -387,7 +386,7 @@ LOCAL_LDFLAGS_Release := \ LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) LOCAL_STATIC_LIBRARIES := \ - skia_skia_gyp \ + skia_skia_library_gyp \ third_party_libphonenumber_libphonenumber_without_metadata_gyp \ ui_ui_gyp diff --git a/components/autofill_core_browser.target.linux-arm.mk b/components/autofill_core_browser.target.linux-arm.mk index be2b5ce72f..973f381b79 100644 --- a/components/autofill_core_browser.target.linux-arm.mk +++ b/components/autofill_core_browser.target.linux-arm.mk @@ -12,7 +12,8 @@ gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := \ $(call intermediates-dir-for,GYP,components_autofill_regexes_gyp)/autofill_regexes.stamp \ - $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_gyp)/skia_skia_gyp.a \ + $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \ + $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \ $(call intermediates-dir-for,GYP,third_party_icu_icui18n_gyp)/icui18n.stamp \ $(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp \ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libphonenumber_libphonenumber_without_metadata_gyp)/third_party_libphonenumber_libphonenumber_without_metadata_gyp.a \ @@ -117,17 +118,16 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ - '-DSK_BUILD_NO_IMAGE_ENCODE' \ - '-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \ - '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ - '-DGR_AGGRESSIVE_SHADER_OPTS=1' \ '-DSK_ENABLE_INST_COUNT=0' \ - '-DSK_USE_POSIX_THREADS' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_BUILD_FOR_ANDROID' \ + '-DUSE_CHROMIUM_SKIA' \ + '-DSK_USE_POSIX_THREADS' \ '-DU_USING_ICU_NAMESPACE=0' \ '-DFEATURE_ENABLE_SSL' \ '-DFEATURE_ENABLE_VOICEMAIL' \ @@ -162,8 +162,8 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH)/third_party/khronos \ $(LOCAL_PATH)/gpu \ - $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/include/config \ $(LOCAL_PATH)/third_party/skia/include/core \ $(LOCAL_PATH)/third_party/skia/include/effects \ @@ -253,17 +253,16 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ - '-DSK_BUILD_NO_IMAGE_ENCODE' \ - '-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \ - '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ - '-DGR_AGGRESSIVE_SHADER_OPTS=1' \ '-DSK_ENABLE_INST_COUNT=0' \ - '-DSK_USE_POSIX_THREADS' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_BUILD_FOR_ANDROID' \ + '-DUSE_CHROMIUM_SKIA' \ + '-DSK_USE_POSIX_THREADS' \ '-DU_USING_ICU_NAMESPACE=0' \ '-DFEATURE_ENABLE_SSL' \ '-DFEATURE_ENABLE_VOICEMAIL' \ @@ -299,8 +298,8 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH)/third_party/khronos \ $(LOCAL_PATH)/gpu \ - $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/include/config \ $(LOCAL_PATH)/third_party/skia/include/core \ $(LOCAL_PATH)/third_party/skia/include/effects \ @@ -389,7 +388,7 @@ LOCAL_LDFLAGS_Release := \ LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) LOCAL_STATIC_LIBRARIES := \ - skia_skia_gyp \ + skia_skia_library_gyp \ third_party_libphonenumber_libphonenumber_without_metadata_gyp \ ui_ui_gyp diff --git a/components/autofill_core_browser.target.linux-mips.mk b/components/autofill_core_browser.target.linux-mips.mk index 3897b86d03..c19dde6de4 100644 --- a/components/autofill_core_browser.target.linux-mips.mk +++ b/components/autofill_core_browser.target.linux-mips.mk @@ -12,7 +12,8 @@ gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := \ $(call intermediates-dir-for,GYP,components_autofill_regexes_gyp)/autofill_regexes.stamp \ - $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_gyp)/skia_skia_gyp.a \ + $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \ + $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \ $(call intermediates-dir-for,GYP,third_party_icu_icui18n_gyp)/icui18n.stamp \ $(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp \ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libphonenumber_libphonenumber_without_metadata_gyp)/third_party_libphonenumber_libphonenumber_without_metadata_gyp.a \ @@ -116,17 +117,16 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ - '-DSK_BUILD_NO_IMAGE_ENCODE' \ - '-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \ - '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ - '-DGR_AGGRESSIVE_SHADER_OPTS=1' \ '-DSK_ENABLE_INST_COUNT=0' \ - '-DSK_USE_POSIX_THREADS' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_BUILD_FOR_ANDROID' \ + '-DUSE_CHROMIUM_SKIA' \ + '-DSK_USE_POSIX_THREADS' \ '-DU_USING_ICU_NAMESPACE=0' \ '-DFEATURE_ENABLE_SSL' \ '-DFEATURE_ENABLE_VOICEMAIL' \ @@ -161,8 +161,8 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH)/third_party/khronos \ $(LOCAL_PATH)/gpu \ - $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/include/config \ $(LOCAL_PATH)/third_party/skia/include/core \ $(LOCAL_PATH)/third_party/skia/include/effects \ @@ -251,17 +251,16 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ - '-DSK_BUILD_NO_IMAGE_ENCODE' \ - '-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \ - '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ - '-DGR_AGGRESSIVE_SHADER_OPTS=1' \ '-DSK_ENABLE_INST_COUNT=0' \ - '-DSK_USE_POSIX_THREADS' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_BUILD_FOR_ANDROID' \ + '-DUSE_CHROMIUM_SKIA' \ + '-DSK_USE_POSIX_THREADS' \ '-DU_USING_ICU_NAMESPACE=0' \ '-DFEATURE_ENABLE_SSL' \ '-DFEATURE_ENABLE_VOICEMAIL' \ @@ -297,8 +296,8 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH)/third_party/khronos \ $(LOCAL_PATH)/gpu \ - $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/include/config \ $(LOCAL_PATH)/third_party/skia/include/core \ $(LOCAL_PATH)/third_party/skia/include/effects \ @@ -383,7 +382,7 @@ LOCAL_LDFLAGS_Release := \ LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) LOCAL_STATIC_LIBRARIES := \ - skia_skia_gyp \ + skia_skia_library_gyp \ third_party_libphonenumber_libphonenumber_without_metadata_gyp \ ui_ui_gyp diff --git a/components/autofill_core_browser.target.linux-x86.mk b/components/autofill_core_browser.target.linux-x86.mk index 337d66f94f..1b3a9193d2 100644 --- a/components/autofill_core_browser.target.linux-x86.mk +++ b/components/autofill_core_browser.target.linux-x86.mk @@ -12,7 +12,8 @@ gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := \ $(call intermediates-dir-for,GYP,components_autofill_regexes_gyp)/autofill_regexes.stamp \ - $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_gyp)/skia_skia_gyp.a \ + $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \ + $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \ $(call intermediates-dir-for,GYP,third_party_icu_icui18n_gyp)/icui18n.stamp \ $(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp \ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libphonenumber_libphonenumber_without_metadata_gyp)/third_party_libphonenumber_libphonenumber_without_metadata_gyp.a \ @@ -119,17 +120,16 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ - '-DSK_BUILD_NO_IMAGE_ENCODE' \ - '-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \ - '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ - '-DGR_AGGRESSIVE_SHADER_OPTS=1' \ '-DSK_ENABLE_INST_COUNT=0' \ - '-DSK_USE_POSIX_THREADS' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_BUILD_FOR_ANDROID' \ + '-DUSE_CHROMIUM_SKIA' \ + '-DSK_USE_POSIX_THREADS' \ '-DU_USING_ICU_NAMESPACE=0' \ '-DFEATURE_ENABLE_SSL' \ '-DFEATURE_ENABLE_VOICEMAIL' \ @@ -163,8 +163,8 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH)/third_party/khronos \ $(LOCAL_PATH)/gpu \ - $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/include/config \ $(LOCAL_PATH)/third_party/skia/include/core \ $(LOCAL_PATH)/third_party/skia/include/effects \ @@ -257,17 +257,16 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ - '-DSK_BUILD_NO_IMAGE_ENCODE' \ - '-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \ - '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ - '-DGR_AGGRESSIVE_SHADER_OPTS=1' \ '-DSK_ENABLE_INST_COUNT=0' \ - '-DSK_USE_POSIX_THREADS' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_BUILD_FOR_ANDROID' \ + '-DUSE_CHROMIUM_SKIA' \ + '-DSK_USE_POSIX_THREADS' \ '-DU_USING_ICU_NAMESPACE=0' \ '-DFEATURE_ENABLE_SSL' \ '-DFEATURE_ENABLE_VOICEMAIL' \ @@ -302,8 +301,8 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH)/third_party/khronos \ $(LOCAL_PATH)/gpu \ - $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/include/config \ $(LOCAL_PATH)/third_party/skia/include/core \ $(LOCAL_PATH)/third_party/skia/include/effects \ @@ -387,7 +386,7 @@ LOCAL_LDFLAGS_Release := \ LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) LOCAL_STATIC_LIBRARIES := \ - skia_skia_gyp \ + skia_skia_library_gyp \ third_party_libphonenumber_libphonenumber_without_metadata_gyp \ ui_ui_gyp diff --git a/components/autofill_core_common.target.darwin-arm.mk b/components/autofill_core_common.target.darwin-arm.mk index 6c96d467c0..b8d497d0ea 100644 --- a/components/autofill_core_common.target.darwin-arm.mk +++ b/components/autofill_core_common.target.darwin-arm.mk @@ -86,10 +86,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DPOSIX_AVOID_MMAP' \ '-DU_USING_ICU_NAMESPACE=0' \ '-D__STDC_CONSTANT_MACROS' \ @@ -175,10 +175,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DPOSIX_AVOID_MMAP' \ '-DU_USING_ICU_NAMESPACE=0' \ '-D__STDC_CONSTANT_MACROS' \ diff --git a/components/autofill_core_common.target.darwin-mips.mk b/components/autofill_core_common.target.darwin-mips.mk index f45972cb75..2e71b2228d 100644 --- a/components/autofill_core_common.target.darwin-mips.mk +++ b/components/autofill_core_common.target.darwin-mips.mk @@ -85,10 +85,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DPOSIX_AVOID_MMAP' \ '-DU_USING_ICU_NAMESPACE=0' \ '-D__STDC_CONSTANT_MACROS' \ @@ -173,10 +173,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DPOSIX_AVOID_MMAP' \ '-DU_USING_ICU_NAMESPACE=0' \ '-D__STDC_CONSTANT_MACROS' \ diff --git a/components/autofill_core_common.target.darwin-x86.mk b/components/autofill_core_common.target.darwin-x86.mk index ec7be90d4d..3debf7873b 100644 --- a/components/autofill_core_common.target.darwin-x86.mk +++ b/components/autofill_core_common.target.darwin-x86.mk @@ -88,10 +88,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DU_USING_ICU_NAMESPACE=0' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ @@ -179,10 +179,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DU_USING_ICU_NAMESPACE=0' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ diff --git a/components/autofill_core_common.target.linux-arm.mk b/components/autofill_core_common.target.linux-arm.mk index 6c96d467c0..b8d497d0ea 100644 --- a/components/autofill_core_common.target.linux-arm.mk +++ b/components/autofill_core_common.target.linux-arm.mk @@ -86,10 +86,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DPOSIX_AVOID_MMAP' \ '-DU_USING_ICU_NAMESPACE=0' \ '-D__STDC_CONSTANT_MACROS' \ @@ -175,10 +175,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DPOSIX_AVOID_MMAP' \ '-DU_USING_ICU_NAMESPACE=0' \ '-D__STDC_CONSTANT_MACROS' \ diff --git a/components/autofill_core_common.target.linux-mips.mk b/components/autofill_core_common.target.linux-mips.mk index f45972cb75..2e71b2228d 100644 --- a/components/autofill_core_common.target.linux-mips.mk +++ b/components/autofill_core_common.target.linux-mips.mk @@ -85,10 +85,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DPOSIX_AVOID_MMAP' \ '-DU_USING_ICU_NAMESPACE=0' \ '-D__STDC_CONSTANT_MACROS' \ @@ -173,10 +173,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DPOSIX_AVOID_MMAP' \ '-DU_USING_ICU_NAMESPACE=0' \ '-D__STDC_CONSTANT_MACROS' \ diff --git a/components/autofill_core_common.target.linux-x86.mk b/components/autofill_core_common.target.linux-x86.mk index ec7be90d4d..3debf7873b 100644 --- a/components/autofill_core_common.target.linux-x86.mk +++ b/components/autofill_core_common.target.linux-x86.mk @@ -88,10 +88,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DU_USING_ICU_NAMESPACE=0' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ @@ -179,10 +179,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DU_USING_ICU_NAMESPACE=0' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ diff --git a/components/autofill_jni_headers.target.darwin-arm.mk b/components/autofill_jni_headers.target.darwin-arm.mk index fe70f232db..45ba4c39e9 100644 --- a/components/autofill_jni_headers.target.darwin-arm.mk +++ b/components/autofill_jni_headers.target.darwin-arm.mk @@ -86,10 +86,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -164,10 +164,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ diff --git a/components/autofill_jni_headers.target.darwin-mips.mk b/components/autofill_jni_headers.target.darwin-mips.mk index 2f18a90922..6cb8efeec1 100644 --- a/components/autofill_jni_headers.target.darwin-mips.mk +++ b/components/autofill_jni_headers.target.darwin-mips.mk @@ -85,10 +85,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -162,10 +162,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ diff --git a/components/autofill_jni_headers.target.darwin-x86.mk b/components/autofill_jni_headers.target.darwin-x86.mk index d0905174ee..f1df2eff5d 100644 --- a/components/autofill_jni_headers.target.darwin-x86.mk +++ b/components/autofill_jni_headers.target.darwin-x86.mk @@ -88,10 +88,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -169,10 +169,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ diff --git a/components/autofill_jni_headers.target.linux-arm.mk b/components/autofill_jni_headers.target.linux-arm.mk index fe70f232db..45ba4c39e9 100644 --- a/components/autofill_jni_headers.target.linux-arm.mk +++ b/components/autofill_jni_headers.target.linux-arm.mk @@ -86,10 +86,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -164,10 +164,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ diff --git a/components/autofill_jni_headers.target.linux-mips.mk b/components/autofill_jni_headers.target.linux-mips.mk index 2f18a90922..6cb8efeec1 100644 --- a/components/autofill_jni_headers.target.linux-mips.mk +++ b/components/autofill_jni_headers.target.linux-mips.mk @@ -85,10 +85,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -162,10 +162,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ diff --git a/components/autofill_jni_headers.target.linux-x86.mk b/components/autofill_jni_headers.target.linux-x86.mk index d0905174ee..f1df2eff5d 100644 --- a/components/autofill_jni_headers.target.linux-x86.mk +++ b/components/autofill_jni_headers.target.linux-x86.mk @@ -88,10 +88,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -169,10 +169,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ diff --git a/components/breakpad/breakpad_client.cc b/components/breakpad/breakpad_client.cc index 502884ed12..ecfe166797 100644 --- a/components/breakpad/breakpad_client.cc +++ b/components/breakpad/breakpad_client.cc @@ -4,6 +4,7 @@ #include "components/breakpad/breakpad_client.h" +#include "base/files/file_path.h" #include "base/logging.h" namespace breakpad { @@ -35,7 +36,8 @@ bool BreakpadClient::GetAlternativeCrashDumpLocation( void BreakpadClient::GetProductNameAndVersion(const base::FilePath& exe_path, base::string16* product_name, base::string16* version, - base::string16* special_build) { + base::string16* special_build, + base::string16* channel_name) { } bool BreakpadClient::ShouldShowRestartDialog(base::string16* title, @@ -47,12 +49,32 @@ bool BreakpadClient::ShouldShowRestartDialog(base::string16* title, bool BreakpadClient::AboutToRestart() { return true; } + +base::string16 BreakpadClient::GetCrashGUID() { + return base::string16(); +} + +bool BreakpadClient::GetDeferredUploadsSupported(bool is_per_usr_install) { + return false; +} + +bool BreakpadClient::GetIsPerUserInstall(const base::FilePath& exe_path) { + return false; +} + +bool BreakpadClient::GetShouldDumpLargerDumps(bool is_per_user_install) { + return false; +} #endif #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_IOS) void BreakpadClient::GetProductNameAndVersion(std::string* product_name, std::string* version) { } + +base::FilePath BreakpadClient::GetReporterLogFilename() { + return base::FilePath(); +} #endif bool BreakpadClient::GetCrashDumpLocation(base::FilePath* crash_dir) { @@ -72,4 +94,10 @@ bool BreakpadClient::IsRunningUnattended() { return false; } +#if defined(OS_WIN) || defined(OS_MACOSX) +bool BreakpadClient::GetCollectStatsConsent() { + return false; +} +#endif + } // namespace breakpad diff --git a/components/breakpad/breakpad_client.h b/components/breakpad/breakpad_client.h index 12dccdea04..b678dcf185 100644 --- a/components/breakpad/breakpad_client.h +++ b/components/breakpad/breakpad_client.h @@ -41,7 +41,8 @@ class BreakpadClient { virtual void GetProductNameAndVersion(const base::FilePath& exe_path, base::string16* product_name, base::string16* version, - base::string16* special_build); + base::string16* special_build, + base::string16* channel_name); // Returns true if a restart dialog should be displayed. In that case, // |message| and |title| are set to a message to display in a dialog box with @@ -54,6 +55,18 @@ class BreakpadClient { // Returns true if it is ok to restart the application. Invoked right before // restarting after a crash. virtual bool AboutToRestart(); + + // Returns a GUID to embed in the crash report. + virtual base::string16 GetCrashGUID(); + + // Returns true if the crash report uploader supports deferred uploads. + virtual bool GetDeferredUploadsSupported(bool is_per_user_install); + + // Returns true if the running binary is a per-user installation. + virtual bool GetIsPerUserInstall(const base::FilePath& exe_path); + + // Returns true if larger crash dumps should be dumped. + virtual bool GetShouldDumpLargerDumps(bool is_per_user_install); #endif #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_IOS) @@ -61,6 +74,8 @@ class BreakpadClient { // in the crash report. virtual void GetProductNameAndVersion(std::string* product_name, std::string* version); + + virtual base::FilePath GetReporterLogFilename(); #endif // The location where minidump files should be written. Returns true if @@ -79,6 +94,11 @@ class BreakpadClient { // Returns true if running in unattended mode (for automated testing). virtual bool IsRunningUnattended(); + +#if defined(OS_WIN) || defined(OS_MACOSX) + // Returns true if the user has given consent to collect stats. + virtual bool GetCollectStatsConsent(); +#endif }; } // namespace breakpad diff --git a/components/components_tests.gypi b/components/components_tests.gypi index 2de146b145..b8e560008b 100644 --- a/components/components_tests.gypi +++ b/components/components_tests.gypi @@ -79,6 +79,14 @@ '../sync/sync.gyp:sync', ], }], + ['OS=="linux" and component=="shared_library" and linux_use_tcmalloc==1', { + 'dependencies': [ + '<(DEPTH)/base/allocator/allocator.gyp:allocator', + ], + 'link_settings': { + 'ldflags': ['-rdynamic'], + }, + }], ], # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 'msvs_disabled_warnings': [4267, ], diff --git a/components/encryptor.target.darwin-arm.mk b/components/encryptor.target.darwin-arm.mk index 06e40e21b6..16315dff91 100644 --- a/components/encryptor.target.darwin-arm.mk +++ b/components/encryptor.target.darwin-arm.mk @@ -69,10 +69,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -149,10 +149,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ diff --git a/components/encryptor.target.darwin-mips.mk b/components/encryptor.target.darwin-mips.mk index 15bcfac796..d9bddbb4c6 100644 --- a/components/encryptor.target.darwin-mips.mk +++ b/components/encryptor.target.darwin-mips.mk @@ -68,10 +68,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -147,10 +147,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ diff --git a/components/encryptor.target.darwin-x86.mk b/components/encryptor.target.darwin-x86.mk index 865c642d74..4da82438ea 100644 --- a/components/encryptor.target.darwin-x86.mk +++ b/components/encryptor.target.darwin-x86.mk @@ -71,10 +71,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -154,10 +154,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ diff --git a/components/encryptor.target.linux-arm.mk b/components/encryptor.target.linux-arm.mk index 06e40e21b6..16315dff91 100644 --- a/components/encryptor.target.linux-arm.mk +++ b/components/encryptor.target.linux-arm.mk @@ -69,10 +69,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -149,10 +149,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ diff --git a/components/encryptor.target.linux-mips.mk b/components/encryptor.target.linux-mips.mk index 15bcfac796..d9bddbb4c6 100644 --- a/components/encryptor.target.linux-mips.mk +++ b/components/encryptor.target.linux-mips.mk @@ -68,10 +68,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -147,10 +147,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ diff --git a/components/encryptor.target.linux-x86.mk b/components/encryptor.target.linux-x86.mk index 865c642d74..4da82438ea 100644 --- a/components/encryptor.target.linux-x86.mk +++ b/components/encryptor.target.linux-x86.mk @@ -71,10 +71,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -154,10 +154,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ diff --git a/components/nacl/common/DEPS b/components/nacl/common/DEPS new file mode 100644 index 0000000000..9583dc6ba8 --- /dev/null +++ b/components/nacl/common/DEPS @@ -0,0 +1,3 @@ +include_rules = [ + "+native_client/src", +] diff --git a/components/nacl/common/OWNERS b/components/nacl/common/OWNERS new file mode 100644 index 0000000000..6a8067ecf2 --- /dev/null +++ b/components/nacl/common/OWNERS @@ -0,0 +1,10 @@ +# Changes to IPC messages require a security review to avoid introducing +# new sandbox escapes. +per-file *_messages*.h=set noparent +per-file *_messages*.h=cdn@chromium.org +per-file *_messages*.h=cevans@chromium.org +per-file *_messages*.h=jln@chromium.org +per-file *_messages*.h=jschuh@chromium.org +per-file *_messages*.h=palmer@chromium.org +per-file *_messages*.h=tsepez@chromium.org + diff --git a/components/nacl/common/nacl_debug_exception_handler_win.cc b/components/nacl/common/nacl_debug_exception_handler_win.cc new file mode 100644 index 0000000000..f661391c4f --- /dev/null +++ b/components/nacl/common/nacl_debug_exception_handler_win.cc @@ -0,0 +1,78 @@ +// Copyright 2013 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "components/nacl/common/nacl_debug_exception_handler_win.h" + +#include "base/bind.h" +#include "base/threading/platform_thread.h" +#include "base/win/scoped_handle.h" +#include "native_client/src/trusted/service_runtime/win/debug_exception_handler.h" + +namespace { + +class DebugExceptionHandler : public base::PlatformThread::Delegate { + public: + DebugExceptionHandler(base::ProcessHandle nacl_process, + const std::string& startup_info, + base::MessageLoopProxy* message_loop, + const base::Callback<void(bool)>& on_connected) + : nacl_process_(nacl_process), + startup_info_(startup_info), + message_loop_(message_loop), + on_connected_(on_connected) { + } + + virtual void ThreadMain() OVERRIDE { + // In the Windows API, the set of processes being debugged is + // thread-local, so we have to attach to the process (using + // DebugActiveProcess()) on the same thread on which + // NaClDebugExceptionHandlerRun() receives debug events for the + // process. + bool attached = false; + int pid = GetProcessId(nacl_process_); + if (pid == 0) { + LOG(ERROR) << "Invalid process handle"; + } else { + if (!DebugActiveProcess(pid)) { + LOG(ERROR) << "Failed to connect to the process"; + } else { + attached = true; + } + } + message_loop_->PostTask(FROM_HERE, base::Bind(on_connected_, attached)); + + if (attached) { + NaClDebugExceptionHandlerRun( + nacl_process_, + reinterpret_cast<const void*>(startup_info_.data()), + startup_info_.size()); + } + delete this; + } + + private: + base::win::ScopedHandle nacl_process_; + std::string startup_info_; + base::MessageLoopProxy* message_loop_; + base::Callback<void(bool)> on_connected_; + + DISALLOW_COPY_AND_ASSIGN(DebugExceptionHandler); +}; + +} // namespace + +void NaClStartDebugExceptionHandlerThread( + base::ProcessHandle nacl_process, + const std::string& startup_info, + base::MessageLoopProxy* message_loop, + const base::Callback<void(bool)>& on_connected) { + // The new PlatformThread will take ownership of the + // DebugExceptionHandler object, which will delete itself on exit. + DebugExceptionHandler* handler = new DebugExceptionHandler( + nacl_process, startup_info, message_loop, on_connected); + if (!base::PlatformThread::CreateNonJoinable(0, handler)) { + on_connected.Run(false); + delete handler; + } +} diff --git a/components/nacl/common/nacl_debug_exception_handler_win.h b/components/nacl/common/nacl_debug_exception_handler_win.h new file mode 100644 index 0000000000..42beefe851 --- /dev/null +++ b/components/nacl/common/nacl_debug_exception_handler_win.h @@ -0,0 +1,18 @@ +// Copyright 2013 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef COMPONENTS_NACL_COMMON_NACL_DEBUG_EXCEPTION_HANDLER_WIN_H_ +#define COMPONENTS_NACL_COMMON_NACL_DEBUG_EXCEPTION_HANDLER_WIN_H_ + +#include "base/callback.h" +#include "base/message_loop/message_loop.h" +#include "base/process/process.h" + +void NaClStartDebugExceptionHandlerThread( + base::ProcessHandle nacl_process, + const std::string& startup_info, + base::MessageLoopProxy* message_loop, + const base::Callback<void(bool)>& on_connected); + +#endif // COMPONENTS_NACL_COMMON_NACL_DEBUG_EXCEPTION_HANDLER_WIN_H_ diff --git a/components/nacl/common/nacl_helper_linux.h b/components/nacl/common/nacl_helper_linux.h new file mode 100644 index 0000000000..732b21570a --- /dev/null +++ b/components/nacl/common/nacl_helper_linux.h @@ -0,0 +1,42 @@ +// Copyright 2013 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef COMPONENTS_NACL_COMMON_NACL_HELPER_LINUX_H_ +#define COMPONENTS_NACL_COMMON_NACL_HELPER_LINUX_H_ + +// A mini-zygote specifically for Native Client. This file defines +// constants used to implement communication between the nacl_helper +// process and the Chrome zygote. + +// Used by Helper to tell Zygote it has started successfully. +#define kNaClHelperStartupAck "NACLHELPER_OK" +// Used by Zygote to ask Helper to fork a new NaCl loader. +#define kNaClForkRequest "NACLFORK" + +// The next set of constants define global Linux file descriptors. +// For communications between NaCl loader and browser. +// See also content/common/zygote_main_linux.cc and +// http://code.google.com/p/chromium/wiki/LinuxZygote + +// For communications between NaCl loader and zygote. +#define kNaClZygoteDescriptor 3 +// For communications between the NaCl loader process and +// the SUID sandbox. +#define kNaClSandboxDescriptor 5 +// NOTE: kNaClSandboxDescriptor must match +// content/browser/zygote_main_linux.cc +// kMagicSandboxIPCDescriptor. + +// A fork request from the Zygote to the helper includes an array +// of three file descriptors. These constants are used as indicies +// into the array. +// Used to pass in the descriptor for talking to the Browser +#define kNaClBrowserFDIndex 0 +// The next two are used in the protocol for discovering the +// child processes real PID from within the SUID sandbox. See +// http://code.google.com/p/chromium/wiki/LinuxZygote +#define kNaClDummyFDIndex 1 +#define kNaClParentFDIndex 2 + +#endif // COMPONENTS_NACL_COMMON_NACL_HELPER_LINUX_H_ diff --git a/components/nacl/common/nacl_host_messages.h b/components/nacl/common/nacl_host_messages.h new file mode 100644 index 0000000000..0f3df7e9a6 --- /dev/null +++ b/components/nacl/common/nacl_host_messages.h @@ -0,0 +1,98 @@ +// Copyright 2013 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// Multiply-included file, no traditional include guard. + +#include <string> + +#include "base/basictypes.h" +#include "base/process/process.h" +#include "build/build_config.h" +#include "components/nacl/common/nacl_types.h" +#include "components/nacl/common/pnacl_types.h" +#include "content/public/common/common_param_traits.h" +#include "ipc/ipc_channel_handle.h" +#include "ipc/ipc_message_macros.h" +#include "ipc/ipc_platform_file.h" +#include "url/gurl.h" + +#define IPC_MESSAGE_START NaClHostMsgStart + +IPC_STRUCT_TRAITS_BEGIN(nacl::NaClLaunchParams) + IPC_STRUCT_TRAITS_MEMBER(manifest_url) + IPC_STRUCT_TRAITS_MEMBER(render_view_id) + IPC_STRUCT_TRAITS_MEMBER(permission_bits) + IPC_STRUCT_TRAITS_MEMBER(uses_irt) + IPC_STRUCT_TRAITS_MEMBER(enable_dyncode_syscalls) + IPC_STRUCT_TRAITS_MEMBER(enable_exception_handling) +IPC_STRUCT_TRAITS_END() + +IPC_STRUCT_TRAITS_BEGIN(nacl::NaClLaunchResult) + IPC_STRUCT_TRAITS_MEMBER(imc_channel_handle) + IPC_STRUCT_TRAITS_MEMBER(ipc_channel_handle) + IPC_STRUCT_TRAITS_MEMBER(plugin_pid) + IPC_STRUCT_TRAITS_MEMBER(plugin_child_id) +IPC_STRUCT_TRAITS_END() + +IPC_STRUCT_TRAITS_BEGIN(nacl::PnaclCacheInfo) + IPC_STRUCT_TRAITS_MEMBER(pexe_url) + IPC_STRUCT_TRAITS_MEMBER(abi_version) + IPC_STRUCT_TRAITS_MEMBER(opt_level) + IPC_STRUCT_TRAITS_MEMBER(last_modified) + IPC_STRUCT_TRAITS_MEMBER(etag) +IPC_STRUCT_TRAITS_END() + +// A renderer sends this to the browser process when it wants to start +// a new instance of the Native Client process. The browser will launch +// the process and return an IPC channel handle. This handle will only +// be valid if the NaCl IPC proxy is enabled. +IPC_SYNC_MESSAGE_CONTROL1_2(NaClHostMsg_LaunchNaCl, + nacl::NaClLaunchParams /* launch_params */, + nacl::NaClLaunchResult /* launch_result */, + std::string /* error_message */) + +// A renderer sends this to the browser process when it wants to +// open a file for from the Pnacl component directory. +IPC_SYNC_MESSAGE_CONTROL1_1(NaClHostMsg_GetReadonlyPnaclFD, + std::string /* name of requested PNaCl file */, + IPC::PlatformFileForTransit /* output file */) + +// A renderer sends this to the browser process when it wants to +// create a temporary file. +IPC_SYNC_MESSAGE_CONTROL0_1(NaClHostMsg_NaClCreateTemporaryFile, + IPC::PlatformFileForTransit /* out file */) + +// A renderer sends this to the browser to request a file descriptor for +// a translated nexe. +IPC_MESSAGE_CONTROL3(NaClHostMsg_NexeTempFileRequest, + int /* render_view_id */, + int /* instance */, + nacl::PnaclCacheInfo /* cache info */) + +// The browser replies to a renderer's temp file request with output_file, +// which is either a writeable temp file to use for translation, or a +// read-only file containing the translated nexe from the cache. +IPC_MESSAGE_CONTROL3(NaClViewMsg_NexeTempFileReply, + int /* instance */, + bool /* is_cache_hit */, + IPC::PlatformFileForTransit /* output file */) + +// A renderer sends this to the browser to report that its translation has +// finished and its temp file contains the translated nexe. +IPC_MESSAGE_CONTROL1(NaClHostMsg_ReportTranslationFinished, + int /* instance */) + +// A renderer sends this to the browser process to report an error. +IPC_MESSAGE_CONTROL2(NaClHostMsg_NaClErrorStatus, + int /* render_view_id */, + int /* Error ID */) + +// A renderer sends this to the browser process when it wants to +// open a NaCl executable file from an installed application directory. +IPC_SYNC_MESSAGE_CONTROL2_3(NaClHostMsg_OpenNaClExecutable, + int /* render_view_id */, + GURL /* URL of NaCl executable file */, + IPC::PlatformFileForTransit /* output file */, + uint64 /* file_token_lo */, + uint64 /* file_token_hi */) diff --git a/components/nacl/common/nacl_messages.cc b/components/nacl/common/nacl_messages.cc new file mode 100644 index 0000000000..21407368ae --- /dev/null +++ b/components/nacl/common/nacl_messages.cc @@ -0,0 +1,34 @@ +// Copyright 2013 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// Get basic type definitions. +#define IPC_MESSAGE_IMPL +#include "components/nacl/common/nacl_messages.h" + +// Generate constructors. +#include "ipc/struct_constructor_macros.h" +#include "components/nacl/common/nacl_messages.h" + +// Generate destructors. +#include "ipc/struct_destructor_macros.h" +#include "components/nacl/common/nacl_messages.h" + +// Generate param traits write methods. +#include "ipc/param_traits_write_macros.h" +namespace IPC { +#include "components/nacl/common/nacl_messages.h" +} // namespace IPC + +// Generate param traits read methods. +#include "ipc/param_traits_read_macros.h" +namespace IPC { +#include "components/nacl/common/nacl_messages.h" +} // namespace IPC + +// Generate param traits log methods. +#include "ipc/param_traits_log_macros.h" +namespace IPC { +#include "components/nacl/common/nacl_messages.h" +} // namespace IPC + diff --git a/components/nacl/common/nacl_messages.h b/components/nacl/common/nacl_messages.h new file mode 100644 index 0000000000..068a0f9cc5 --- /dev/null +++ b/components/nacl/common/nacl_messages.h @@ -0,0 +1,94 @@ +// Copyright 2013 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// Defines messages between the browser and NaCl process. + +// Multiply-included message file, no traditional include guard. +#include "base/process/process.h" +#include "components/nacl/common/nacl_types.h" +#include "ipc/ipc_channel_handle.h" +#include "ipc/ipc_message_macros.h" +#include "ipc/ipc_platform_file.h" + +#define IPC_MESSAGE_START NaClMsgStart + +IPC_STRUCT_TRAITS_BEGIN(nacl::NaClStartParams) + IPC_STRUCT_TRAITS_MEMBER(handles) + IPC_STRUCT_TRAITS_MEMBER(debug_stub_server_bound_socket) + IPC_STRUCT_TRAITS_MEMBER(validation_cache_enabled) + IPC_STRUCT_TRAITS_MEMBER(validation_cache_key) + IPC_STRUCT_TRAITS_MEMBER(version) + IPC_STRUCT_TRAITS_MEMBER(enable_exception_handling) + IPC_STRUCT_TRAITS_MEMBER(enable_debug_stub) + IPC_STRUCT_TRAITS_MEMBER(enable_ipc_proxy) + IPC_STRUCT_TRAITS_MEMBER(uses_irt) + IPC_STRUCT_TRAITS_MEMBER(enable_dyncode_syscalls) +IPC_STRUCT_TRAITS_END() + +//----------------------------------------------------------------------------- +// NaClProcess messages +// These are messages sent between the browser and the NaCl process. +// Tells the NaCl process to start. +IPC_MESSAGE_CONTROL1(NaClProcessMsg_Start, + nacl::NaClStartParams /* params */) + +#if defined(OS_WIN) +// Tells the NaCl broker to launch a NaCl loader process. +IPC_MESSAGE_CONTROL1(NaClProcessMsg_LaunchLoaderThroughBroker, + std::string /* channel ID for the loader */) + +// Notify the browser process that the loader was launched successfully. +IPC_MESSAGE_CONTROL2(NaClProcessMsg_LoaderLaunched, + std::string, /* channel ID for the loader */ + base::ProcessHandle /* loader process handle */) + +// Tells the NaCl broker to attach a debug exception handler to the +// given NaCl loader process. +IPC_MESSAGE_CONTROL3(NaClProcessMsg_LaunchDebugExceptionHandler, + int32 /* pid of the NaCl process */, + base::ProcessHandle /* handle of the NaCl process */, + std::string /* NaCl internal process layout info */) + +// Notify the browser process that the broker process finished +// attaching a debug exception handler to the given NaCl loader +// process. +IPC_MESSAGE_CONTROL2(NaClProcessMsg_DebugExceptionHandlerLaunched, + int32 /* pid */, + bool /* success */) + +// Notify the broker that all loader processes have been terminated and it +// should shutdown. +IPC_MESSAGE_CONTROL0(NaClProcessMsg_StopBroker) + +// Used by the NaCl process to request that a Windows debug exception +// handler be attached to it. +IPC_SYNC_MESSAGE_CONTROL1_1(NaClProcessMsg_AttachDebugExceptionHandler, + std::string, /* Internal process info */ + bool /* Result */) +#endif + +// Used by the NaCl process to query a database in the browser. The database +// contains the signatures of previously validated code chunks. +IPC_SYNC_MESSAGE_CONTROL1_1(NaClProcessMsg_QueryKnownToValidate, + std::string, /* A validation signature */ + bool /* Can validation be skipped? */) + +// Used by the NaCl process to add a validation signature to the validation +// database in the browser. +IPC_MESSAGE_CONTROL1(NaClProcessMsg_SetKnownToValidate, + std::string /* A validation signature */) + +// Used by the NaCl process to acquire trusted information about a file directly +// from the browser, including the file's path as well as a fresh version of the +// file handle. +IPC_SYNC_MESSAGE_CONTROL2_2(NaClProcessMsg_ResolveFileToken, + uint64, /* file_token_lo */ + uint64, /* file_token_hi */ + IPC::PlatformFileForTransit, /* fd */ + base::FilePath /* Path opened to get fd */) + +// Notify the browser process that the server side of the PPAPI channel was +// created successfully. +IPC_MESSAGE_CONTROL1(NaClProcessHostMsg_PpapiChannelCreated, + IPC::ChannelHandle /* channel_handle */) diff --git a/components/nacl/common/nacl_paths.cc b/components/nacl/common/nacl_paths.cc new file mode 100644 index 0000000000..cb046c23ea --- /dev/null +++ b/components/nacl/common/nacl_paths.cc @@ -0,0 +1,53 @@ +// Copyright 2013 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "components/nacl/common/nacl_paths.h" + +#include "base/file_util.h" +#include "base/path_service.h" + +namespace { + +#if defined(OS_POSIX) && !defined(OS_MACOSX) +// File name of the nacl_helper and nacl_helper_bootstrap, Linux only. +const base::FilePath::CharType kInternalNaClHelperFileName[] = + FILE_PATH_LITERAL("nacl_helper"); +const base::FilePath::CharType kInternalNaClHelperBootstrapFileName[] = + FILE_PATH_LITERAL("nacl_helper_bootstrap"); +#endif + +} // namespace + +namespace nacl { + +bool PathProvider(int key, base::FilePath* result) { + base::FilePath cur; + switch (key) { +#if defined(OS_LINUX) + case FILE_NACL_HELPER: + if (!PathService::Get(base::DIR_MODULE, &cur)) + return false; + cur = cur.Append(kInternalNaClHelperFileName); + break; + case FILE_NACL_HELPER_BOOTSTRAP: + if (!PathService::Get(base::DIR_MODULE, &cur)) + return false; + cur = cur.Append(kInternalNaClHelperBootstrapFileName); + break; +#endif + default: + return false; + } + + *result = cur; + return true; +} + +// This cannot be done as a static initializer sadly since Visual Studio will +// eliminate this object file if there is no direct entry point into it. +void RegisterPathProvider() { + PathService::RegisterProvider(PathProvider, PATH_START, PATH_END); +} + +} // namespace nacl diff --git a/components/nacl/common/nacl_paths.h b/components/nacl/common/nacl_paths.h new file mode 100644 index 0000000000..424d8bdb48 --- /dev/null +++ b/components/nacl/common/nacl_paths.h @@ -0,0 +1,31 @@ +// Copyright 2013 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef COMPONENTS_NACL_COMMON_NACL_PATHS_H_ +#define COMPONENTS_NACL_COMMON_NACL_PATHS_H_ + +#include "build/build_config.h" + +// This file declares path keys for the chrome module. These can be used with +// the PathService to access various special directories and files. + +namespace nacl { + +enum { + PATH_START = 9000, + +#if defined(OS_LINUX) + FILE_NACL_HELPER = PATH_START, // Full path to Linux nacl_helper executable. + FILE_NACL_HELPER_BOOTSTRAP, // ... and nacl_helper_bootstrap executable. +#endif + + PATH_END +}; + +// Call once to register the provider for the path keys defined above. +void RegisterPathProvider(); + +} // namespace nacl + +#endif // COMPONENTS_NACL_COMMON_NACL_PATHS_H_ diff --git a/components/nacl/common/nacl_types.cc b/components/nacl/common/nacl_types.cc new file mode 100644 index 0000000000..dea0239112 --- /dev/null +++ b/components/nacl/common/nacl_types.cc @@ -0,0 +1,77 @@ +// Copyright 2013 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "components/nacl/common/nacl_types.h" +#include "ipc/ipc_platform_file.h" + +namespace nacl { + +NaClStartParams::NaClStartParams() + : validation_cache_enabled(false), + enable_exception_handling(false), + enable_debug_stub(false), + enable_ipc_proxy(false), + uses_irt(false), + enable_dyncode_syscalls(false) { +} + +NaClStartParams::~NaClStartParams() { +} + +NaClLaunchParams::NaClLaunchParams() + : render_view_id(0), + permission_bits(0), + uses_irt(false), + enable_dyncode_syscalls(false), + enable_exception_handling(false) { +} + +NaClLaunchParams::NaClLaunchParams(const std::string& manifest_url, + int render_view_id, + uint32 permission_bits, + bool uses_irt, + bool enable_dyncode_syscalls, + bool enable_exception_handling) + : manifest_url(manifest_url), + render_view_id(render_view_id), + permission_bits(permission_bits), + uses_irt(uses_irt), + enable_dyncode_syscalls(enable_dyncode_syscalls), + enable_exception_handling(enable_exception_handling) { +} + +NaClLaunchParams::NaClLaunchParams(const NaClLaunchParams& l) { + manifest_url = l.manifest_url; + render_view_id = l.render_view_id; + permission_bits = l.permission_bits; + uses_irt = l.uses_irt; + enable_dyncode_syscalls = l.enable_dyncode_syscalls; + enable_exception_handling = l.enable_exception_handling; +} + +NaClLaunchParams::~NaClLaunchParams() { +} + +NaClLaunchResult::NaClLaunchResult() + : imc_channel_handle(IPC::InvalidPlatformFileForTransit()), + ipc_channel_handle(), + plugin_pid(base::kNullProcessId), + plugin_child_id(0) { +} + +NaClLaunchResult::NaClLaunchResult( + FileDescriptor imc_channel_handle, + const IPC::ChannelHandle& ipc_channel_handle, + base::ProcessId plugin_pid, + int plugin_child_id) + : imc_channel_handle(imc_channel_handle), + ipc_channel_handle(ipc_channel_handle), + plugin_pid(plugin_pid), + plugin_child_id(plugin_child_id) { +} + +NaClLaunchResult::~NaClLaunchResult() { +} + +} // namespace nacl diff --git a/components/nacl/common/nacl_types.h b/components/nacl/common/nacl_types.h new file mode 100644 index 0000000000..c1f69434c7 --- /dev/null +++ b/components/nacl/common/nacl_types.h @@ -0,0 +1,101 @@ +// Copyright 2013 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef COMPONENTS_NACL_COMMON_NACL_TYPES_H_ +#define COMPONENTS_NACL_COMMON_NACL_TYPES_H_ + +#include <string> +#include <vector> + +#include "base/basictypes.h" +#include "base/process.h" +#include "build/build_config.h" +#include "ipc/ipc_channel.h" + +#if defined(OS_POSIX) +#include "base/file_descriptor_posix.h" +#endif + +#if defined(OS_WIN) +#include <windows.h> // for HANDLE +#endif + +// TODO(gregoryd): add a Windows definition for base::FileDescriptor +namespace nacl { + +#if defined(OS_WIN) +typedef HANDLE FileDescriptor; +inline HANDLE ToNativeHandle(const FileDescriptor& desc) { + return desc; +} +#elif defined(OS_POSIX) +typedef base::FileDescriptor FileDescriptor; +inline int ToNativeHandle(const FileDescriptor& desc) { + return desc.fd; +} +#endif + + +// Parameters sent to the NaCl process when we start it. +// +// If you change this, you will also need to update the IPC serialization in +// nacl_messages.h. +struct NaClStartParams { + NaClStartParams(); + ~NaClStartParams(); + + std::vector<FileDescriptor> handles; + FileDescriptor debug_stub_server_bound_socket; + + bool validation_cache_enabled; + std::string validation_cache_key; + // Chrome version string. Sending the version string over IPC avoids linkage + // issues in cases where NaCl is not compiled into the main Chromium + // executable or DLL. + std::string version; + + bool enable_exception_handling; + bool enable_debug_stub; + bool enable_ipc_proxy; + bool uses_irt; + bool enable_dyncode_syscalls; +}; + +// Parameters sent to the browser process to have it launch a NaCl process. +// +// If you change this, you will also need to update the IPC serialization in +// nacl_host_messages.h. +struct NaClLaunchParams { + NaClLaunchParams(); + NaClLaunchParams(const std::string& u, int r, uint32 p, bool uses_irt, + bool enable_dyncode_syscalls, + bool enable_exception_handling); + NaClLaunchParams(const NaClLaunchParams& l); + ~NaClLaunchParams(); + + std::string manifest_url; + int render_view_id; + uint32 permission_bits; + bool uses_irt; + bool enable_dyncode_syscalls; + bool enable_exception_handling; +}; + +struct NaClLaunchResult { + NaClLaunchResult(); + NaClLaunchResult(FileDescriptor imc_channel_handle, + const IPC::ChannelHandle& ipc_channel_handle, + base::ProcessId plugin_pid, + int plugin_child_id); + ~NaClLaunchResult(); + + FileDescriptor imc_channel_handle; + IPC::ChannelHandle ipc_channel_handle; + base::ProcessId plugin_pid; + int plugin_child_id; +}; + +} // namespace nacl + +#endif // COMPONENTS_NACL_COMMON_NACL_TYPES_H_ diff --git a/components/nacl/common/pnacl_types.cc b/components/nacl/common/pnacl_types.cc new file mode 100644 index 0000000000..f6302bc9c9 --- /dev/null +++ b/components/nacl/common/pnacl_types.cc @@ -0,0 +1,12 @@ +// Copyright 2013 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "components/nacl/common/pnacl_types.h" + +namespace nacl { + +PnaclCacheInfo::PnaclCacheInfo() {} +PnaclCacheInfo::~PnaclCacheInfo() {} + +} // namespace nacl diff --git a/components/nacl/common/pnacl_types.h b/components/nacl/common/pnacl_types.h new file mode 100644 index 0000000000..802319bd71 --- /dev/null +++ b/components/nacl/common/pnacl_types.h @@ -0,0 +1,33 @@ +// Copyright 2013 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef COMPONENTS_NACL_COMMON_PNACL_TYPES_H_ +#define COMPONENTS_NACL_COMMON_PNACL_TYPES_H_ + +// This file exists (instead of putting this type into nacl_types.h) because +// nacl_types is built into nacl_helper in addition to chrome, and we don't +// want to pull src/url/ into there, since it would be unnecessary bloat. + +#include "base/time/time.h" +#include "url/gurl.h" + +namespace nacl { +// Cache-related information about pexe files, sent from the plugin/renderer +// to the browser. +// +// If you change this, you will also need to update the IPC serialization in +// nacl_host_messages.h. +struct PnaclCacheInfo { + PnaclCacheInfo(); + ~PnaclCacheInfo(); + GURL pexe_url; + int abi_version; + int opt_level; + base::Time last_modified; + std::string etag; +}; + +} // namespace nacl + +#endif // COMPONENTS_NACL_COMMON_PNACL_TYPES_H_ diff --git a/components/nacl_common.gyp b/components/nacl_common.gyp index 642d61a171..1364ef2cd6 100644 --- a/components/nacl_common.gyp +++ b/components/nacl_common.gyp @@ -21,6 +21,10 @@ 'sources': [ 'nacl/common/nacl_cmd_line.cc', 'nacl/common/nacl_cmd_line.h', + 'nacl/common/nacl_messages.cc', + 'nacl/common/nacl_messages.h', + 'nacl/common/nacl_types.cc', + 'nacl/common/nacl_types.h', ], 'include_dirs': [ '..', @@ -52,6 +56,10 @@ 'sources': [ 'nacl/common/nacl_cmd_line.cc', 'nacl/common/nacl_cmd_line.h', + 'nacl/common/nacl_messages.cc', + 'nacl/common/nacl_messages.h', + 'nacl/common/nacl_types.cc', + 'nacl/common/nacl_types.h', ], 'include_dirs': [ '..', diff --git a/components/navigation_interception.target.darwin-arm.mk b/components/navigation_interception.target.darwin-arm.mk index d80d11bb83..33ed0ddd3e 100644 --- a/components/navigation_interception.target.darwin-arm.mk +++ b/components/navigation_interception.target.darwin-arm.mk @@ -74,10 +74,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DPOSIX_AVOID_MMAP' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ @@ -161,10 +161,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DPOSIX_AVOID_MMAP' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ diff --git a/components/navigation_interception.target.darwin-mips.mk b/components/navigation_interception.target.darwin-mips.mk index 017b3fa5e0..35a496432f 100644 --- a/components/navigation_interception.target.darwin-mips.mk +++ b/components/navigation_interception.target.darwin-mips.mk @@ -73,10 +73,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DPOSIX_AVOID_MMAP' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ @@ -159,10 +159,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DPOSIX_AVOID_MMAP' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ diff --git a/components/navigation_interception.target.darwin-x86.mk b/components/navigation_interception.target.darwin-x86.mk index 59caa1897a..436945f6ae 100644 --- a/components/navigation_interception.target.darwin-x86.mk +++ b/components/navigation_interception.target.darwin-x86.mk @@ -76,10 +76,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -165,10 +165,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ diff --git a/components/navigation_interception.target.linux-arm.mk b/components/navigation_interception.target.linux-arm.mk index d80d11bb83..33ed0ddd3e 100644 --- a/components/navigation_interception.target.linux-arm.mk +++ b/components/navigation_interception.target.linux-arm.mk @@ -74,10 +74,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DPOSIX_AVOID_MMAP' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ @@ -161,10 +161,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DPOSIX_AVOID_MMAP' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ diff --git a/components/navigation_interception.target.linux-mips.mk b/components/navigation_interception.target.linux-mips.mk index 017b3fa5e0..35a496432f 100644 --- a/components/navigation_interception.target.linux-mips.mk +++ b/components/navigation_interception.target.linux-mips.mk @@ -73,10 +73,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DPOSIX_AVOID_MMAP' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ @@ -159,10 +159,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DPOSIX_AVOID_MMAP' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ diff --git a/components/navigation_interception.target.linux-x86.mk b/components/navigation_interception.target.linux-x86.mk index 59caa1897a..436945f6ae 100644 --- a/components/navigation_interception.target.linux-x86.mk +++ b/components/navigation_interception.target.linux-x86.mk @@ -76,10 +76,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -165,10 +165,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ diff --git a/components/navigation_interception/intercept_navigation_resource_throttle_unittest.cc b/components/navigation_interception/intercept_navigation_resource_throttle_unittest.cc index dfccb30746..e1bd566b54 100644 --- a/components/navigation_interception/intercept_navigation_resource_throttle_unittest.cc +++ b/components/navigation_interception/intercept_navigation_resource_throttle_unittest.cc @@ -26,13 +26,14 @@ #include "net/http/http_response_headers.h" #include "net/http/http_response_info.h" #include "net/url_request/url_request.h" +#include "net/url_request/url_request_test_util.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" using testing::_; using testing::Eq; -using testing::Property; using testing::Ne; +using testing::Property; using testing::Return; namespace navigation_interception { @@ -117,7 +118,8 @@ class TestIOThreadState { const std::string& request_method, RedirectMode redirect_mode, MockInterceptCallbackReceiver* callback_receiver) - : request_(url, NULL, resource_context_.GetRequestContext()) { + : resource_context_(&test_url_request_context_), + request_(url, NULL, resource_context_.GetRequestContext()) { DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); if (render_process_id != MSG_ROUTING_NONE && render_view_id != MSG_ROUTING_NONE) { @@ -164,6 +166,7 @@ class TestIOThreadState { } private: + net::TestURLRequestContext test_url_request_context_; content::MockResourceContext resource_context_; net::URLRequest request_; scoped_ptr<InterceptNavigationResourceThrottle> throttle_; diff --git a/components/navigation_interception_jni_headers.target.darwin-arm.mk b/components/navigation_interception_jni_headers.target.darwin-arm.mk index 3552ff1d84..212bfee13e 100644 --- a/components/navigation_interception_jni_headers.target.darwin-arm.mk +++ b/components/navigation_interception_jni_headers.target.darwin-arm.mk @@ -98,10 +98,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -176,10 +176,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ diff --git a/components/navigation_interception_jni_headers.target.darwin-mips.mk b/components/navigation_interception_jni_headers.target.darwin-mips.mk index 5ab080a7e0..87a4032787 100644 --- a/components/navigation_interception_jni_headers.target.darwin-mips.mk +++ b/components/navigation_interception_jni_headers.target.darwin-mips.mk @@ -97,10 +97,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -174,10 +174,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ diff --git a/components/navigation_interception_jni_headers.target.darwin-x86.mk b/components/navigation_interception_jni_headers.target.darwin-x86.mk index 05f9c0a83b..67297d6317 100644 --- a/components/navigation_interception_jni_headers.target.darwin-x86.mk +++ b/components/navigation_interception_jni_headers.target.darwin-x86.mk @@ -100,10 +100,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -181,10 +181,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ diff --git a/components/navigation_interception_jni_headers.target.linux-arm.mk b/components/navigation_interception_jni_headers.target.linux-arm.mk index 3552ff1d84..212bfee13e 100644 --- a/components/navigation_interception_jni_headers.target.linux-arm.mk +++ b/components/navigation_interception_jni_headers.target.linux-arm.mk @@ -98,10 +98,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -176,10 +176,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ diff --git a/components/navigation_interception_jni_headers.target.linux-mips.mk b/components/navigation_interception_jni_headers.target.linux-mips.mk index 5ab080a7e0..87a4032787 100644 --- a/components/navigation_interception_jni_headers.target.linux-mips.mk +++ b/components/navigation_interception_jni_headers.target.linux-mips.mk @@ -97,10 +97,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -174,10 +174,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ diff --git a/components/navigation_interception_jni_headers.target.linux-x86.mk b/components/navigation_interception_jni_headers.target.linux-x86.mk index 05f9c0a83b..67297d6317 100644 --- a/components/navigation_interception_jni_headers.target.linux-x86.mk +++ b/components/navigation_interception_jni_headers.target.linux-x86.mk @@ -100,10 +100,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -181,10 +181,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ diff --git a/components/sessions.gypi b/components/sessions.gypi index ad56821604..401015eea0 100644 --- a/components/sessions.gypi +++ b/components/sessions.gypi @@ -25,7 +25,7 @@ 'sessions/serialized_navigation_entry.h', ], 'conditions': [ - ['OS != "ios"', { + ['OS != "ios" and chrome_multiple_dll != 1', { 'dependencies': [ '../webkit/support/webkit_support.gyp:glue', ] diff --git a/components/tracing.target.darwin-arm.mk b/components/tracing.target.darwin-arm.mk index d9c0739932..de5ddf0ee5 100644 --- a/components/tracing.target.darwin-arm.mk +++ b/components/tracing.target.darwin-arm.mk @@ -73,10 +73,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -155,10 +155,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ diff --git a/components/tracing.target.darwin-mips.mk b/components/tracing.target.darwin-mips.mk index 54f3ded246..983d9d5a86 100644 --- a/components/tracing.target.darwin-mips.mk +++ b/components/tracing.target.darwin-mips.mk @@ -73,10 +73,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -155,10 +155,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ diff --git a/components/tracing.target.darwin-x86.mk b/components/tracing.target.darwin-x86.mk index 808d4ed3ef..c3727717cb 100644 --- a/components/tracing.target.darwin-x86.mk +++ b/components/tracing.target.darwin-x86.mk @@ -75,10 +75,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -160,10 +160,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ diff --git a/components/tracing.target.linux-arm.mk b/components/tracing.target.linux-arm.mk index d9c0739932..de5ddf0ee5 100644 --- a/components/tracing.target.linux-arm.mk +++ b/components/tracing.target.linux-arm.mk @@ -73,10 +73,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -155,10 +155,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ diff --git a/components/tracing.target.linux-mips.mk b/components/tracing.target.linux-mips.mk index 54f3ded246..983d9d5a86 100644 --- a/components/tracing.target.linux-mips.mk +++ b/components/tracing.target.linux-mips.mk @@ -73,10 +73,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -155,10 +155,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ diff --git a/components/tracing.target.linux-x86.mk b/components/tracing.target.linux-x86.mk index 808d4ed3ef..c3727717cb 100644 --- a/components/tracing.target.linux-x86.mk +++ b/components/tracing.target.linux-x86.mk @@ -75,10 +75,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -160,10 +160,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ diff --git a/components/user_prefs.target.darwin-arm.mk b/components/user_prefs.target.darwin-arm.mk index 4586d8d748..a15104a1fb 100644 --- a/components/user_prefs.target.darwin-arm.mk +++ b/components/user_prefs.target.darwin-arm.mk @@ -71,10 +71,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DUSER_PREFS_IMPLEMENTATION' \ '-DPOSIX_AVOID_MMAP' \ '-DU_USING_ICU_NAMESPACE=0' \ @@ -160,10 +160,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DUSER_PREFS_IMPLEMENTATION' \ '-DPOSIX_AVOID_MMAP' \ '-DU_USING_ICU_NAMESPACE=0' \ diff --git a/components/user_prefs.target.darwin-mips.mk b/components/user_prefs.target.darwin-mips.mk index 1a0b1bffd4..33c81a49b7 100644 --- a/components/user_prefs.target.darwin-mips.mk +++ b/components/user_prefs.target.darwin-mips.mk @@ -70,10 +70,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DUSER_PREFS_IMPLEMENTATION' \ '-DPOSIX_AVOID_MMAP' \ '-DU_USING_ICU_NAMESPACE=0' \ @@ -158,10 +158,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DUSER_PREFS_IMPLEMENTATION' \ '-DPOSIX_AVOID_MMAP' \ '-DU_USING_ICU_NAMESPACE=0' \ diff --git a/components/user_prefs.target.darwin-x86.mk b/components/user_prefs.target.darwin-x86.mk index bc80344db1..4c5a8a6807 100644 --- a/components/user_prefs.target.darwin-x86.mk +++ b/components/user_prefs.target.darwin-x86.mk @@ -73,10 +73,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DUSER_PREFS_IMPLEMENTATION' \ '-DU_USING_ICU_NAMESPACE=0' \ '-D__STDC_CONSTANT_MACROS' \ @@ -164,10 +164,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DUSER_PREFS_IMPLEMENTATION' \ '-DU_USING_ICU_NAMESPACE=0' \ '-D__STDC_CONSTANT_MACROS' \ diff --git a/components/user_prefs.target.linux-arm.mk b/components/user_prefs.target.linux-arm.mk index 4586d8d748..a15104a1fb 100644 --- a/components/user_prefs.target.linux-arm.mk +++ b/components/user_prefs.target.linux-arm.mk @@ -71,10 +71,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DUSER_PREFS_IMPLEMENTATION' \ '-DPOSIX_AVOID_MMAP' \ '-DU_USING_ICU_NAMESPACE=0' \ @@ -160,10 +160,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DUSER_PREFS_IMPLEMENTATION' \ '-DPOSIX_AVOID_MMAP' \ '-DU_USING_ICU_NAMESPACE=0' \ diff --git a/components/user_prefs.target.linux-mips.mk b/components/user_prefs.target.linux-mips.mk index 1a0b1bffd4..33c81a49b7 100644 --- a/components/user_prefs.target.linux-mips.mk +++ b/components/user_prefs.target.linux-mips.mk @@ -70,10 +70,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DUSER_PREFS_IMPLEMENTATION' \ '-DPOSIX_AVOID_MMAP' \ '-DU_USING_ICU_NAMESPACE=0' \ @@ -158,10 +158,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DUSER_PREFS_IMPLEMENTATION' \ '-DPOSIX_AVOID_MMAP' \ '-DU_USING_ICU_NAMESPACE=0' \ diff --git a/components/user_prefs.target.linux-x86.mk b/components/user_prefs.target.linux-x86.mk index bc80344db1..4c5a8a6807 100644 --- a/components/user_prefs.target.linux-x86.mk +++ b/components/user_prefs.target.linux-x86.mk @@ -73,10 +73,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DUSER_PREFS_IMPLEMENTATION' \ '-DU_USING_ICU_NAMESPACE=0' \ '-D__STDC_CONSTANT_MACROS' \ @@ -164,10 +164,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DUSER_PREFS_IMPLEMENTATION' \ '-DU_USING_ICU_NAMESPACE=0' \ '-D__STDC_CONSTANT_MACROS' \ diff --git a/components/visitedlink/browser/visitedlink_master.cc b/components/visitedlink/browser/visitedlink_master.cc index 699f587eff..7cf68911af 100644 --- a/components/visitedlink/browser/visitedlink_master.cc +++ b/components/visitedlink/browser/visitedlink_master.cc @@ -20,7 +20,6 @@ #include "base/logging.h" #include "base/message_loop/message_loop.h" #include "base/path_service.h" -#include "base/process_util.h" #include "base/rand_util.h" #include "base/strings/string_util.h" #include "base/threading/thread_restrictions.h" diff --git a/components/visitedlink/test/visitedlink_unittest.cc b/components/visitedlink/test/visitedlink_unittest.cc index b0e5fcdb9f..0943106338 100644 --- a/components/visitedlink/test/visitedlink_unittest.cc +++ b/components/visitedlink/test/visitedlink_unittest.cc @@ -10,7 +10,7 @@ #include "base/memory/shared_memory.h" #include "base/message_loop/message_loop.h" #include "base/path_service.h" -#include "base/process_util.h" +#include "base/process/process_handle.h" #include "base/run_loop.h" #include "base/strings/string_util.h" #include "base/time/time.h" diff --git a/components/visitedlink_browser.target.darwin-arm.mk b/components/visitedlink_browser.target.darwin-arm.mk index 02cecaa173..1a5198aeb3 100644 --- a/components/visitedlink_browser.target.darwin-arm.mk +++ b/components/visitedlink_browser.target.darwin-arm.mk @@ -70,10 +70,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -155,10 +155,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ diff --git a/components/visitedlink_browser.target.darwin-mips.mk b/components/visitedlink_browser.target.darwin-mips.mk index b72a6d6d32..a993f1a102 100644 --- a/components/visitedlink_browser.target.darwin-mips.mk +++ b/components/visitedlink_browser.target.darwin-mips.mk @@ -69,10 +69,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -153,10 +153,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ diff --git a/components/visitedlink_browser.target.darwin-x86.mk b/components/visitedlink_browser.target.darwin-x86.mk index 8cec8e1613..373399e11c 100644 --- a/components/visitedlink_browser.target.darwin-x86.mk +++ b/components/visitedlink_browser.target.darwin-x86.mk @@ -72,10 +72,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -160,10 +160,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ diff --git a/components/visitedlink_browser.target.linux-arm.mk b/components/visitedlink_browser.target.linux-arm.mk index 02cecaa173..1a5198aeb3 100644 --- a/components/visitedlink_browser.target.linux-arm.mk +++ b/components/visitedlink_browser.target.linux-arm.mk @@ -70,10 +70,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -155,10 +155,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ diff --git a/components/visitedlink_browser.target.linux-mips.mk b/components/visitedlink_browser.target.linux-mips.mk index b72a6d6d32..a993f1a102 100644 --- a/components/visitedlink_browser.target.linux-mips.mk +++ b/components/visitedlink_browser.target.linux-mips.mk @@ -69,10 +69,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -153,10 +153,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ diff --git a/components/visitedlink_browser.target.linux-x86.mk b/components/visitedlink_browser.target.linux-x86.mk index 8cec8e1613..373399e11c 100644 --- a/components/visitedlink_browser.target.linux-x86.mk +++ b/components/visitedlink_browser.target.linux-x86.mk @@ -72,10 +72,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -160,10 +160,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ diff --git a/components/visitedlink_common.target.darwin-arm.mk b/components/visitedlink_common.target.darwin-arm.mk index 81c186b89e..48a7f56af0 100644 --- a/components/visitedlink_common.target.darwin-arm.mk +++ b/components/visitedlink_common.target.darwin-arm.mk @@ -70,10 +70,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -154,10 +154,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ diff --git a/components/visitedlink_common.target.darwin-mips.mk b/components/visitedlink_common.target.darwin-mips.mk index 627f538d0a..a1b4f4c761 100644 --- a/components/visitedlink_common.target.darwin-mips.mk +++ b/components/visitedlink_common.target.darwin-mips.mk @@ -69,10 +69,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -152,10 +152,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ diff --git a/components/visitedlink_common.target.darwin-x86.mk b/components/visitedlink_common.target.darwin-x86.mk index 5811f63a5e..988efdfa6d 100644 --- a/components/visitedlink_common.target.darwin-x86.mk +++ b/components/visitedlink_common.target.darwin-x86.mk @@ -72,10 +72,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -159,10 +159,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ diff --git a/components/visitedlink_common.target.linux-arm.mk b/components/visitedlink_common.target.linux-arm.mk index 81c186b89e..48a7f56af0 100644 --- a/components/visitedlink_common.target.linux-arm.mk +++ b/components/visitedlink_common.target.linux-arm.mk @@ -70,10 +70,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -154,10 +154,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ diff --git a/components/visitedlink_common.target.linux-mips.mk b/components/visitedlink_common.target.linux-mips.mk index 627f538d0a..a1b4f4c761 100644 --- a/components/visitedlink_common.target.linux-mips.mk +++ b/components/visitedlink_common.target.linux-mips.mk @@ -69,10 +69,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -152,10 +152,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ diff --git a/components/visitedlink_common.target.linux-x86.mk b/components/visitedlink_common.target.linux-x86.mk index 5811f63a5e..988efdfa6d 100644 --- a/components/visitedlink_common.target.linux-x86.mk +++ b/components/visitedlink_common.target.linux-x86.mk @@ -72,10 +72,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -159,10 +159,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ diff --git a/components/visitedlink_renderer.target.darwin-arm.mk b/components/visitedlink_renderer.target.darwin-arm.mk index d5219ca249..514048d051 100644 --- a/components/visitedlink_renderer.target.darwin-arm.mk +++ b/components/visitedlink_renderer.target.darwin-arm.mk @@ -12,7 +12,7 @@ gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := \ $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp \ - $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_gyp)/skia_skia_gyp.a + $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a GYP_GENERATED_OUTPUTS := @@ -71,17 +71,16 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ - '-DSK_BUILD_NO_IMAGE_ENCODE' \ - '-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \ - '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ - '-DGR_AGGRESSIVE_SHADER_OPTS=1' \ '-DSK_ENABLE_INST_COUNT=0' \ - '-DSK_USE_POSIX_THREADS' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_BUILD_FOR_ANDROID' \ + '-DUSE_CHROMIUM_SKIA' \ + '-DSK_USE_POSIX_THREADS' \ '-DU_USING_ICU_NAMESPACE=0' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ @@ -104,8 +103,8 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/gpu \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/WebKit \ - $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/include/config \ $(LOCAL_PATH)/third_party/skia/include/core \ $(LOCAL_PATH)/third_party/skia/include/effects \ @@ -183,17 +182,16 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ - '-DSK_BUILD_NO_IMAGE_ENCODE' \ - '-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \ - '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ - '-DGR_AGGRESSIVE_SHADER_OPTS=1' \ '-DSK_ENABLE_INST_COUNT=0' \ - '-DSK_USE_POSIX_THREADS' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_BUILD_FOR_ANDROID' \ + '-DUSE_CHROMIUM_SKIA' \ + '-DSK_USE_POSIX_THREADS' \ '-DU_USING_ICU_NAMESPACE=0' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ @@ -217,8 +215,8 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/gpu \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/WebKit \ - $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/include/config \ $(LOCAL_PATH)/third_party/skia/include/core \ $(LOCAL_PATH)/third_party/skia/include/effects \ @@ -295,7 +293,7 @@ LOCAL_LDFLAGS_Release := \ LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) LOCAL_STATIC_LIBRARIES := \ - skia_skia_gyp + skia_skia_library_gyp # Enable grouping to fix circular references LOCAL_GROUP_STATIC_LIBRARIES := true diff --git a/components/visitedlink_renderer.target.darwin-mips.mk b/components/visitedlink_renderer.target.darwin-mips.mk index 100da8e190..e801739aba 100644 --- a/components/visitedlink_renderer.target.darwin-mips.mk +++ b/components/visitedlink_renderer.target.darwin-mips.mk @@ -12,7 +12,7 @@ gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := \ $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp \ - $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_gyp)/skia_skia_gyp.a + $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a GYP_GENERATED_OUTPUTS := @@ -70,17 +70,16 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ - '-DSK_BUILD_NO_IMAGE_ENCODE' \ - '-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \ - '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ - '-DGR_AGGRESSIVE_SHADER_OPTS=1' \ '-DSK_ENABLE_INST_COUNT=0' \ - '-DSK_USE_POSIX_THREADS' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_BUILD_FOR_ANDROID' \ + '-DUSE_CHROMIUM_SKIA' \ + '-DSK_USE_POSIX_THREADS' \ '-DU_USING_ICU_NAMESPACE=0' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ @@ -103,8 +102,8 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/gpu \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/WebKit \ - $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/include/config \ $(LOCAL_PATH)/third_party/skia/include/core \ $(LOCAL_PATH)/third_party/skia/include/effects \ @@ -181,17 +180,16 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ - '-DSK_BUILD_NO_IMAGE_ENCODE' \ - '-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \ - '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ - '-DGR_AGGRESSIVE_SHADER_OPTS=1' \ '-DSK_ENABLE_INST_COUNT=0' \ - '-DSK_USE_POSIX_THREADS' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_BUILD_FOR_ANDROID' \ + '-DUSE_CHROMIUM_SKIA' \ + '-DSK_USE_POSIX_THREADS' \ '-DU_USING_ICU_NAMESPACE=0' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ @@ -215,8 +213,8 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/gpu \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/WebKit \ - $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/include/config \ $(LOCAL_PATH)/third_party/skia/include/core \ $(LOCAL_PATH)/third_party/skia/include/effects \ @@ -289,7 +287,7 @@ LOCAL_LDFLAGS_Release := \ LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) LOCAL_STATIC_LIBRARIES := \ - skia_skia_gyp + skia_skia_library_gyp # Enable grouping to fix circular references LOCAL_GROUP_STATIC_LIBRARIES := true diff --git a/components/visitedlink_renderer.target.darwin-x86.mk b/components/visitedlink_renderer.target.darwin-x86.mk index 219b11e05d..aa2599fc39 100644 --- a/components/visitedlink_renderer.target.darwin-x86.mk +++ b/components/visitedlink_renderer.target.darwin-x86.mk @@ -12,7 +12,7 @@ gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := \ $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp \ - $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_gyp)/skia_skia_gyp.a + $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a GYP_GENERATED_OUTPUTS := @@ -73,17 +73,16 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ - '-DSK_BUILD_NO_IMAGE_ENCODE' \ - '-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \ - '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ - '-DGR_AGGRESSIVE_SHADER_OPTS=1' \ '-DSK_ENABLE_INST_COUNT=0' \ - '-DSK_USE_POSIX_THREADS' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_BUILD_FOR_ANDROID' \ + '-DUSE_CHROMIUM_SKIA' \ + '-DSK_USE_POSIX_THREADS' \ '-DU_USING_ICU_NAMESPACE=0' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ @@ -106,8 +105,8 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/gpu \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/WebKit \ - $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/include/config \ $(LOCAL_PATH)/third_party/skia/include/core \ $(LOCAL_PATH)/third_party/skia/include/effects \ @@ -188,17 +187,16 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ - '-DSK_BUILD_NO_IMAGE_ENCODE' \ - '-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \ - '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ - '-DGR_AGGRESSIVE_SHADER_OPTS=1' \ '-DSK_ENABLE_INST_COUNT=0' \ - '-DSK_USE_POSIX_THREADS' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_BUILD_FOR_ANDROID' \ + '-DUSE_CHROMIUM_SKIA' \ + '-DSK_USE_POSIX_THREADS' \ '-DU_USING_ICU_NAMESPACE=0' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ @@ -222,8 +220,8 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/gpu \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/WebKit \ - $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/include/config \ $(LOCAL_PATH)/third_party/skia/include/core \ $(LOCAL_PATH)/third_party/skia/include/effects \ @@ -295,7 +293,7 @@ LOCAL_LDFLAGS_Release := \ LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) LOCAL_STATIC_LIBRARIES := \ - skia_skia_gyp + skia_skia_library_gyp # Enable grouping to fix circular references LOCAL_GROUP_STATIC_LIBRARIES := true diff --git a/components/visitedlink_renderer.target.linux-arm.mk b/components/visitedlink_renderer.target.linux-arm.mk index d5219ca249..514048d051 100644 --- a/components/visitedlink_renderer.target.linux-arm.mk +++ b/components/visitedlink_renderer.target.linux-arm.mk @@ -12,7 +12,7 @@ gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := \ $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp \ - $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_gyp)/skia_skia_gyp.a + $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a GYP_GENERATED_OUTPUTS := @@ -71,17 +71,16 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ - '-DSK_BUILD_NO_IMAGE_ENCODE' \ - '-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \ - '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ - '-DGR_AGGRESSIVE_SHADER_OPTS=1' \ '-DSK_ENABLE_INST_COUNT=0' \ - '-DSK_USE_POSIX_THREADS' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_BUILD_FOR_ANDROID' \ + '-DUSE_CHROMIUM_SKIA' \ + '-DSK_USE_POSIX_THREADS' \ '-DU_USING_ICU_NAMESPACE=0' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ @@ -104,8 +103,8 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/gpu \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/WebKit \ - $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/include/config \ $(LOCAL_PATH)/third_party/skia/include/core \ $(LOCAL_PATH)/third_party/skia/include/effects \ @@ -183,17 +182,16 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ - '-DSK_BUILD_NO_IMAGE_ENCODE' \ - '-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \ - '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ - '-DGR_AGGRESSIVE_SHADER_OPTS=1' \ '-DSK_ENABLE_INST_COUNT=0' \ - '-DSK_USE_POSIX_THREADS' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_BUILD_FOR_ANDROID' \ + '-DUSE_CHROMIUM_SKIA' \ + '-DSK_USE_POSIX_THREADS' \ '-DU_USING_ICU_NAMESPACE=0' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ @@ -217,8 +215,8 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/gpu \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/WebKit \ - $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/include/config \ $(LOCAL_PATH)/third_party/skia/include/core \ $(LOCAL_PATH)/third_party/skia/include/effects \ @@ -295,7 +293,7 @@ LOCAL_LDFLAGS_Release := \ LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) LOCAL_STATIC_LIBRARIES := \ - skia_skia_gyp + skia_skia_library_gyp # Enable grouping to fix circular references LOCAL_GROUP_STATIC_LIBRARIES := true diff --git a/components/visitedlink_renderer.target.linux-mips.mk b/components/visitedlink_renderer.target.linux-mips.mk index 100da8e190..e801739aba 100644 --- a/components/visitedlink_renderer.target.linux-mips.mk +++ b/components/visitedlink_renderer.target.linux-mips.mk @@ -12,7 +12,7 @@ gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := \ $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp \ - $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_gyp)/skia_skia_gyp.a + $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a GYP_GENERATED_OUTPUTS := @@ -70,17 +70,16 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ - '-DSK_BUILD_NO_IMAGE_ENCODE' \ - '-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \ - '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ - '-DGR_AGGRESSIVE_SHADER_OPTS=1' \ '-DSK_ENABLE_INST_COUNT=0' \ - '-DSK_USE_POSIX_THREADS' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_BUILD_FOR_ANDROID' \ + '-DUSE_CHROMIUM_SKIA' \ + '-DSK_USE_POSIX_THREADS' \ '-DU_USING_ICU_NAMESPACE=0' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ @@ -103,8 +102,8 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/gpu \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/WebKit \ - $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/include/config \ $(LOCAL_PATH)/third_party/skia/include/core \ $(LOCAL_PATH)/third_party/skia/include/effects \ @@ -181,17 +180,16 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ - '-DSK_BUILD_NO_IMAGE_ENCODE' \ - '-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \ - '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ - '-DGR_AGGRESSIVE_SHADER_OPTS=1' \ '-DSK_ENABLE_INST_COUNT=0' \ - '-DSK_USE_POSIX_THREADS' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_BUILD_FOR_ANDROID' \ + '-DUSE_CHROMIUM_SKIA' \ + '-DSK_USE_POSIX_THREADS' \ '-DU_USING_ICU_NAMESPACE=0' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ @@ -215,8 +213,8 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/gpu \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/WebKit \ - $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/include/config \ $(LOCAL_PATH)/third_party/skia/include/core \ $(LOCAL_PATH)/third_party/skia/include/effects \ @@ -289,7 +287,7 @@ LOCAL_LDFLAGS_Release := \ LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) LOCAL_STATIC_LIBRARIES := \ - skia_skia_gyp + skia_skia_library_gyp # Enable grouping to fix circular references LOCAL_GROUP_STATIC_LIBRARIES := true diff --git a/components/visitedlink_renderer.target.linux-x86.mk b/components/visitedlink_renderer.target.linux-x86.mk index 219b11e05d..aa2599fc39 100644 --- a/components/visitedlink_renderer.target.linux-x86.mk +++ b/components/visitedlink_renderer.target.linux-x86.mk @@ -12,7 +12,7 @@ gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := \ $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp \ - $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_gyp)/skia_skia_gyp.a + $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a GYP_GENERATED_OUTPUTS := @@ -73,17 +73,16 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ - '-DSK_BUILD_NO_IMAGE_ENCODE' \ - '-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \ - '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ - '-DGR_AGGRESSIVE_SHADER_OPTS=1' \ '-DSK_ENABLE_INST_COUNT=0' \ - '-DSK_USE_POSIX_THREADS' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_BUILD_FOR_ANDROID' \ + '-DUSE_CHROMIUM_SKIA' \ + '-DSK_USE_POSIX_THREADS' \ '-DU_USING_ICU_NAMESPACE=0' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ @@ -106,8 +105,8 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/gpu \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/WebKit \ - $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/include/config \ $(LOCAL_PATH)/third_party/skia/include/core \ $(LOCAL_PATH)/third_party/skia/include/effects \ @@ -188,17 +187,16 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ - '-DSK_BUILD_NO_IMAGE_ENCODE' \ - '-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \ - '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ - '-DGR_AGGRESSIVE_SHADER_OPTS=1' \ '-DSK_ENABLE_INST_COUNT=0' \ - '-DSK_USE_POSIX_THREADS' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_BUILD_FOR_ANDROID' \ + '-DUSE_CHROMIUM_SKIA' \ + '-DSK_USE_POSIX_THREADS' \ '-DU_USING_ICU_NAMESPACE=0' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ @@ -222,8 +220,8 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/gpu \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/WebKit \ - $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH)/skia/config \ $(LOCAL_PATH)/third_party/skia/include/config \ $(LOCAL_PATH)/third_party/skia/include/core \ $(LOCAL_PATH)/third_party/skia/include/effects \ @@ -295,7 +293,7 @@ LOCAL_LDFLAGS_Release := \ LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) LOCAL_STATIC_LIBRARIES := \ - skia_skia_gyp + skia_skia_library_gyp # Enable grouping to fix circular references LOCAL_GROUP_STATIC_LIBRARIES := true diff --git a/components/web_contents_delegate_android.target.darwin-arm.mk b/components/web_contents_delegate_android.target.darwin-arm.mk index 6e45493816..720f9e9f5c 100644 --- a/components/web_contents_delegate_android.target.darwin-arm.mk +++ b/components/web_contents_delegate_android.target.darwin-arm.mk @@ -11,7 +11,8 @@ gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := \ - $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_gyp)/skia_skia_gyp.a \ + $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \ + $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \ $(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \ $(call intermediates-dir-for,STATIC_LIBRARIES,webkit_support_glue_gyp)/webkit_support_glue_gyp.a \ $(call intermediates-dir-for,GYP,components_web_contents_delegate_android_jni_headers_gyp)/web_contents_delegate_android_jni_headers.stamp @@ -75,18 +76,17 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DPOSIX_AVOID_MMAP' \ - '-DSK_BUILD_NO_IMAGE_ENCODE' \ - '-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \ - '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ - '-DGR_AGGRESSIVE_SHADER_OPTS=1' \ '-DSK_ENABLE_INST_COUNT=0' \ - '-DSK_USE_POSIX_THREADS' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_BUILD_FOR_ANDROID' \ + '-DUSE_CHROMIUM_SKIA' \ + '-DSK_USE_POSIX_THREADS' \ '-DU_USING_ICU_NAMESPACE=0' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ @@ -185,18 +185,17 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DPOSIX_AVOID_MMAP' \ - '-DSK_BUILD_NO_IMAGE_ENCODE' \ - '-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \ - '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ - '-DGR_AGGRESSIVE_SHADER_OPTS=1' \ '-DSK_ENABLE_INST_COUNT=0' \ - '-DSK_USE_POSIX_THREADS' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_BUILD_FOR_ANDROID' \ + '-DUSE_CHROMIUM_SKIA' \ + '-DSK_USE_POSIX_THREADS' \ '-DU_USING_ICU_NAMESPACE=0' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ @@ -295,7 +294,7 @@ LOCAL_LDFLAGS_Release := \ LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) LOCAL_STATIC_LIBRARIES := \ - skia_skia_gyp \ + skia_skia_library_gyp \ ui_ui_gyp \ webkit_support_glue_gyp diff --git a/components/web_contents_delegate_android.target.darwin-mips.mk b/components/web_contents_delegate_android.target.darwin-mips.mk index 0810fafd99..1f48e4400e 100644 --- a/components/web_contents_delegate_android.target.darwin-mips.mk +++ b/components/web_contents_delegate_android.target.darwin-mips.mk @@ -11,7 +11,8 @@ gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := \ - $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_gyp)/skia_skia_gyp.a \ + $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \ + $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \ $(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \ $(call intermediates-dir-for,STATIC_LIBRARIES,webkit_support_glue_gyp)/webkit_support_glue_gyp.a \ $(call intermediates-dir-for,GYP,components_web_contents_delegate_android_jni_headers_gyp)/web_contents_delegate_android_jni_headers.stamp @@ -74,18 +75,17 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DPOSIX_AVOID_MMAP' \ - '-DSK_BUILD_NO_IMAGE_ENCODE' \ - '-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \ - '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ - '-DGR_AGGRESSIVE_SHADER_OPTS=1' \ '-DSK_ENABLE_INST_COUNT=0' \ - '-DSK_USE_POSIX_THREADS' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_BUILD_FOR_ANDROID' \ + '-DUSE_CHROMIUM_SKIA' \ + '-DSK_USE_POSIX_THREADS' \ '-DU_USING_ICU_NAMESPACE=0' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ @@ -183,18 +183,17 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DPOSIX_AVOID_MMAP' \ - '-DSK_BUILD_NO_IMAGE_ENCODE' \ - '-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \ - '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ - '-DGR_AGGRESSIVE_SHADER_OPTS=1' \ '-DSK_ENABLE_INST_COUNT=0' \ - '-DSK_USE_POSIX_THREADS' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_BUILD_FOR_ANDROID' \ + '-DUSE_CHROMIUM_SKIA' \ + '-DSK_USE_POSIX_THREADS' \ '-DU_USING_ICU_NAMESPACE=0' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ @@ -289,7 +288,7 @@ LOCAL_LDFLAGS_Release := \ LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) LOCAL_STATIC_LIBRARIES := \ - skia_skia_gyp \ + skia_skia_library_gyp \ ui_ui_gyp \ webkit_support_glue_gyp diff --git a/components/web_contents_delegate_android.target.darwin-x86.mk b/components/web_contents_delegate_android.target.darwin-x86.mk index 3066510f26..171d21818b 100644 --- a/components/web_contents_delegate_android.target.darwin-x86.mk +++ b/components/web_contents_delegate_android.target.darwin-x86.mk @@ -11,7 +11,8 @@ gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := \ - $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_gyp)/skia_skia_gyp.a \ + $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \ + $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \ $(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \ $(call intermediates-dir-for,STATIC_LIBRARIES,webkit_support_glue_gyp)/webkit_support_glue_gyp.a \ $(call intermediates-dir-for,GYP,components_web_contents_delegate_android_jni_headers_gyp)/web_contents_delegate_android_jni_headers.stamp @@ -77,17 +78,16 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ - '-DSK_BUILD_NO_IMAGE_ENCODE' \ - '-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \ - '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ - '-DGR_AGGRESSIVE_SHADER_OPTS=1' \ '-DSK_ENABLE_INST_COUNT=0' \ - '-DSK_USE_POSIX_THREADS' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_BUILD_FOR_ANDROID' \ + '-DUSE_CHROMIUM_SKIA' \ + '-DSK_USE_POSIX_THREADS' \ '-DU_USING_ICU_NAMESPACE=0' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ @@ -189,17 +189,16 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ - '-DSK_BUILD_NO_IMAGE_ENCODE' \ - '-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \ - '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ - '-DGR_AGGRESSIVE_SHADER_OPTS=1' \ '-DSK_ENABLE_INST_COUNT=0' \ - '-DSK_USE_POSIX_THREADS' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_BUILD_FOR_ANDROID' \ + '-DUSE_CHROMIUM_SKIA' \ + '-DSK_USE_POSIX_THREADS' \ '-DU_USING_ICU_NAMESPACE=0' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ @@ -293,7 +292,7 @@ LOCAL_LDFLAGS_Release := \ LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) LOCAL_STATIC_LIBRARIES := \ - skia_skia_gyp \ + skia_skia_library_gyp \ ui_ui_gyp \ webkit_support_glue_gyp diff --git a/components/web_contents_delegate_android.target.linux-arm.mk b/components/web_contents_delegate_android.target.linux-arm.mk index 6e45493816..720f9e9f5c 100644 --- a/components/web_contents_delegate_android.target.linux-arm.mk +++ b/components/web_contents_delegate_android.target.linux-arm.mk @@ -11,7 +11,8 @@ gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := \ - $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_gyp)/skia_skia_gyp.a \ + $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \ + $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \ $(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \ $(call intermediates-dir-for,STATIC_LIBRARIES,webkit_support_glue_gyp)/webkit_support_glue_gyp.a \ $(call intermediates-dir-for,GYP,components_web_contents_delegate_android_jni_headers_gyp)/web_contents_delegate_android_jni_headers.stamp @@ -75,18 +76,17 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DPOSIX_AVOID_MMAP' \ - '-DSK_BUILD_NO_IMAGE_ENCODE' \ - '-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \ - '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ - '-DGR_AGGRESSIVE_SHADER_OPTS=1' \ '-DSK_ENABLE_INST_COUNT=0' \ - '-DSK_USE_POSIX_THREADS' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_BUILD_FOR_ANDROID' \ + '-DUSE_CHROMIUM_SKIA' \ + '-DSK_USE_POSIX_THREADS' \ '-DU_USING_ICU_NAMESPACE=0' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ @@ -185,18 +185,17 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DPOSIX_AVOID_MMAP' \ - '-DSK_BUILD_NO_IMAGE_ENCODE' \ - '-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \ - '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ - '-DGR_AGGRESSIVE_SHADER_OPTS=1' \ '-DSK_ENABLE_INST_COUNT=0' \ - '-DSK_USE_POSIX_THREADS' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_BUILD_FOR_ANDROID' \ + '-DUSE_CHROMIUM_SKIA' \ + '-DSK_USE_POSIX_THREADS' \ '-DU_USING_ICU_NAMESPACE=0' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ @@ -295,7 +294,7 @@ LOCAL_LDFLAGS_Release := \ LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) LOCAL_STATIC_LIBRARIES := \ - skia_skia_gyp \ + skia_skia_library_gyp \ ui_ui_gyp \ webkit_support_glue_gyp diff --git a/components/web_contents_delegate_android.target.linux-mips.mk b/components/web_contents_delegate_android.target.linux-mips.mk index 0810fafd99..1f48e4400e 100644 --- a/components/web_contents_delegate_android.target.linux-mips.mk +++ b/components/web_contents_delegate_android.target.linux-mips.mk @@ -11,7 +11,8 @@ gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := \ - $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_gyp)/skia_skia_gyp.a \ + $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \ + $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \ $(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \ $(call intermediates-dir-for,STATIC_LIBRARIES,webkit_support_glue_gyp)/webkit_support_glue_gyp.a \ $(call intermediates-dir-for,GYP,components_web_contents_delegate_android_jni_headers_gyp)/web_contents_delegate_android_jni_headers.stamp @@ -74,18 +75,17 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DPOSIX_AVOID_MMAP' \ - '-DSK_BUILD_NO_IMAGE_ENCODE' \ - '-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \ - '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ - '-DGR_AGGRESSIVE_SHADER_OPTS=1' \ '-DSK_ENABLE_INST_COUNT=0' \ - '-DSK_USE_POSIX_THREADS' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_BUILD_FOR_ANDROID' \ + '-DUSE_CHROMIUM_SKIA' \ + '-DSK_USE_POSIX_THREADS' \ '-DU_USING_ICU_NAMESPACE=0' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ @@ -183,18 +183,17 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DPOSIX_AVOID_MMAP' \ - '-DSK_BUILD_NO_IMAGE_ENCODE' \ - '-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \ - '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ - '-DGR_AGGRESSIVE_SHADER_OPTS=1' \ '-DSK_ENABLE_INST_COUNT=0' \ - '-DSK_USE_POSIX_THREADS' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_BUILD_FOR_ANDROID' \ + '-DUSE_CHROMIUM_SKIA' \ + '-DSK_USE_POSIX_THREADS' \ '-DU_USING_ICU_NAMESPACE=0' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ @@ -289,7 +288,7 @@ LOCAL_LDFLAGS_Release := \ LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) LOCAL_STATIC_LIBRARIES := \ - skia_skia_gyp \ + skia_skia_library_gyp \ ui_ui_gyp \ webkit_support_glue_gyp diff --git a/components/web_contents_delegate_android.target.linux-x86.mk b/components/web_contents_delegate_android.target.linux-x86.mk index 3066510f26..171d21818b 100644 --- a/components/web_contents_delegate_android.target.linux-x86.mk +++ b/components/web_contents_delegate_android.target.linux-x86.mk @@ -11,7 +11,8 @@ gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := \ - $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_gyp)/skia_skia_gyp.a \ + $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \ + $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \ $(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \ $(call intermediates-dir-for,STATIC_LIBRARIES,webkit_support_glue_gyp)/webkit_support_glue_gyp.a \ $(call intermediates-dir-for,GYP,components_web_contents_delegate_android_jni_headers_gyp)/web_contents_delegate_android_jni_headers.stamp @@ -77,17 +78,16 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ - '-DSK_BUILD_NO_IMAGE_ENCODE' \ - '-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \ - '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ - '-DGR_AGGRESSIVE_SHADER_OPTS=1' \ '-DSK_ENABLE_INST_COUNT=0' \ - '-DSK_USE_POSIX_THREADS' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_BUILD_FOR_ANDROID' \ + '-DUSE_CHROMIUM_SKIA' \ + '-DSK_USE_POSIX_THREADS' \ '-DU_USING_ICU_NAMESPACE=0' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ @@ -189,17 +189,16 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ - '-DSK_BUILD_NO_IMAGE_ENCODE' \ - '-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \ - '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ - '-DGR_AGGRESSIVE_SHADER_OPTS=1' \ '-DSK_ENABLE_INST_COUNT=0' \ - '-DSK_USE_POSIX_THREADS' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_BUILD_FOR_ANDROID' \ + '-DUSE_CHROMIUM_SKIA' \ + '-DSK_USE_POSIX_THREADS' \ '-DU_USING_ICU_NAMESPACE=0' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ @@ -293,7 +292,7 @@ LOCAL_LDFLAGS_Release := \ LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) LOCAL_STATIC_LIBRARIES := \ - skia_skia_gyp \ + skia_skia_library_gyp \ ui_ui_gyp \ webkit_support_glue_gyp diff --git a/components/web_contents_delegate_android_jni_headers.target.darwin-arm.mk b/components/web_contents_delegate_android_jni_headers.target.darwin-arm.mk index 4be80a31df..711a5171b6 100644 --- a/components/web_contents_delegate_android_jni_headers.target.darwin-arm.mk +++ b/components/web_contents_delegate_android_jni_headers.target.darwin-arm.mk @@ -98,10 +98,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -176,10 +176,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ diff --git a/components/web_contents_delegate_android_jni_headers.target.darwin-mips.mk b/components/web_contents_delegate_android_jni_headers.target.darwin-mips.mk index 989f652e22..02838b6f03 100644 --- a/components/web_contents_delegate_android_jni_headers.target.darwin-mips.mk +++ b/components/web_contents_delegate_android_jni_headers.target.darwin-mips.mk @@ -97,10 +97,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -174,10 +174,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ diff --git a/components/web_contents_delegate_android_jni_headers.target.darwin-x86.mk b/components/web_contents_delegate_android_jni_headers.target.darwin-x86.mk index b885467e55..366cd39384 100644 --- a/components/web_contents_delegate_android_jni_headers.target.darwin-x86.mk +++ b/components/web_contents_delegate_android_jni_headers.target.darwin-x86.mk @@ -100,10 +100,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -181,10 +181,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ diff --git a/components/web_contents_delegate_android_jni_headers.target.linux-arm.mk b/components/web_contents_delegate_android_jni_headers.target.linux-arm.mk index 4be80a31df..711a5171b6 100644 --- a/components/web_contents_delegate_android_jni_headers.target.linux-arm.mk +++ b/components/web_contents_delegate_android_jni_headers.target.linux-arm.mk @@ -98,10 +98,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -176,10 +176,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ diff --git a/components/web_contents_delegate_android_jni_headers.target.linux-mips.mk b/components/web_contents_delegate_android_jni_headers.target.linux-mips.mk index 989f652e22..02838b6f03 100644 --- a/components/web_contents_delegate_android_jni_headers.target.linux-mips.mk +++ b/components/web_contents_delegate_android_jni_headers.target.linux-mips.mk @@ -97,10 +97,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -174,10 +174,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ diff --git a/components/web_contents_delegate_android_jni_headers.target.linux-x86.mk b/components/web_contents_delegate_android_jni_headers.target.linux-x86.mk index b885467e55..366cd39384 100644 --- a/components/web_contents_delegate_android_jni_headers.target.linux-x86.mk +++ b/components/web_contents_delegate_android_jni_headers.target.linux-x86.mk @@ -100,10 +100,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -181,10 +181,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ diff --git a/components/webdata_common.target.darwin-arm.mk b/components/webdata_common.target.darwin-arm.mk index 58ee803e19..aff5f88523 100644 --- a/components/webdata_common.target.darwin-arm.mk +++ b/components/webdata_common.target.darwin-arm.mk @@ -75,10 +75,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DWEBDATA_IMPLEMENTATION' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ @@ -160,10 +160,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DWEBDATA_IMPLEMENTATION' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ diff --git a/components/webdata_common.target.darwin-mips.mk b/components/webdata_common.target.darwin-mips.mk index 1f7586e171..93d30d4fc1 100644 --- a/components/webdata_common.target.darwin-mips.mk +++ b/components/webdata_common.target.darwin-mips.mk @@ -74,10 +74,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DWEBDATA_IMPLEMENTATION' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ @@ -158,10 +158,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DWEBDATA_IMPLEMENTATION' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ diff --git a/components/webdata_common.target.darwin-x86.mk b/components/webdata_common.target.darwin-x86.mk index eb2815a7ce..270b48714a 100644 --- a/components/webdata_common.target.darwin-x86.mk +++ b/components/webdata_common.target.darwin-x86.mk @@ -77,10 +77,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DWEBDATA_IMPLEMENTATION' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ @@ -165,10 +165,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DWEBDATA_IMPLEMENTATION' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ diff --git a/components/webdata_common.target.linux-arm.mk b/components/webdata_common.target.linux-arm.mk index 58ee803e19..aff5f88523 100644 --- a/components/webdata_common.target.linux-arm.mk +++ b/components/webdata_common.target.linux-arm.mk @@ -75,10 +75,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DWEBDATA_IMPLEMENTATION' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ @@ -160,10 +160,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DWEBDATA_IMPLEMENTATION' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ diff --git a/components/webdata_common.target.linux-mips.mk b/components/webdata_common.target.linux-mips.mk index 1f7586e171..93d30d4fc1 100644 --- a/components/webdata_common.target.linux-mips.mk +++ b/components/webdata_common.target.linux-mips.mk @@ -74,10 +74,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DWEBDATA_IMPLEMENTATION' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ @@ -158,10 +158,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DWEBDATA_IMPLEMENTATION' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ diff --git a/components/webdata_common.target.linux-x86.mk b/components/webdata_common.target.linux-x86.mk index eb2815a7ce..270b48714a 100644 --- a/components/webdata_common.target.linux-x86.mk +++ b/components/webdata_common.target.linux-x86.mk @@ -77,10 +77,10 @@ MY_DEFS_Debug := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DWEBDATA_IMPLEMENTATION' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ @@ -165,10 +165,10 @@ MY_DEFS_Release := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DENABLE_LANGUAGE_DETECTION=1' \ '-DWEBDATA_IMPLEMENTATION' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ |