summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2011-06-15 21:22:53 +0100
committerBen Murdoch <benm@google.com>2011-06-16 01:27:25 +0100
commite30fcf9ce6bba420ca582b99a06497e77373c6ac (patch)
tree1e3de5af88ad4eb2cb6f39c246386f76e2089d5e
parentfd1998388c6e6e45dfaf3d6bd71d9fba541b0c43 (diff)
downloadexternal_chromium-e30fcf9ce6bba420ca582b99a06497e77373c6ac.zip
external_chromium-e30fcf9ce6bba420ca582b99a06497e77373c6ac.tar.gz
external_chromium-e30fcf9ce6bba420ca582b99a06497e77373c6ac.tar.bz2
Remove code to detect if we have the private autofill header
This is no longer required after the merge to 11.0.672.0 as the URL to make autofill requests to is now open source. Change-Id: Id5d7b4d7d3b7371846d6896c26a76d61ca059a16
-rw-r--r--Android.mk7
-rwxr-xr-xandroid/haveAutofillInternal.pl79
-rw-r--r--android/prefix.h4
3 files changed, 0 insertions, 90 deletions
diff --git a/Android.mk b/Android.mk
index 9c84c57..a178c1a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -423,7 +423,6 @@ LOCAL_C_INCLUDES := \
THIRD_PARTY = $(INTERMEDIATES)/third_party
SCRIPT := $(LOCAL_PATH)/android/generateAndroidForwardingHeader.pl
-CHECK_INTERNAL_HEADER_SCRIPT := $(LOCAL_PATH)/android/haveAutofillInternal.pl
GEN := $(THIRD_PARTY)/expat/files/lib/expat.h
$(GEN): $(SCRIPT)
@@ -455,12 +454,6 @@ $(GEN):
perl $(SCRIPT) $@ "public/WebString.h"
LOCAL_GENERATED_SOURCES += $(GEN)
-GEN = $(INTERMEDIATES)/HaveAutofillInternal.h
-$(GEN): $(CHECK_INTERNAL_HEADER_SCRIPT)
-$(GEN):
- perl $(CHECK_INTERNAL_HEADER_SCRIPT) $@
-LOCAL_GENERATED_SOURCES += $(GEN)
-
LOCAL_CFLAGS := -DHAVE_CONFIG_H -DANDROID -fvisibility=hidden -DEXPAT_RELATIVE_PATH -DALLOW_QUOTED_COOKIE_VALUES
LOCAL_CPPFLAGS := -Wno-sign-promo -Wno-missing-field-initializers
diff --git a/android/haveAutofillInternal.pl b/android/haveAutofillInternal.pl
deleted file mode 100755
index 4125e25..0000000
--- a/android/haveAutofillInternal.pl
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/usr/bin/perl
-#
-# Copyright 2010, The Android Open Source Project
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-use File::Path;
-
-my $copyright = <<COPYRIGHT;
-/*
- * Copyright 2010, The Android Open Source Project
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-COPYRIGHT
-
-my $autoFillInternalHeader = "vendor/google/libraries/autofill/chrome/browser/autofill/internal/autofill_download_internal.h";
-my $header = "// This file has been generated by haveAutoFillDownloadInternal.pl\n// DO NOT MODIFY!";
-my $forward = $ARGV[0];
-
-$forward =~ m/(.*)\//s;
-mkpath($1);
-
-$guard = $forward;
-$guard =~ s/[\.\/\\]/_/g;
-
-open(my $handle, ">", $forward) or die $!;
-print $handle "$copyright\n";
-print $handle "$header\n\n\n";
-print $handle "#ifndef _${guard}_\n";
-print $handle "#define _${guard}_\n\n";
-
-if (-e $autoFillInternalHeader) {
- print $handle "#define HAVE_AUTOFILL_DOWNLOAD_INTERNAL_H 1\n\n";
-} else {
- print $handle "#define HAVE_AUTOFILL_DOWNLOAD_INTERNAL_H 0\n\n";
-}
-print $handle "#endif // _${guard}_\n";
-close($handle);
-
diff --git a/android/prefix.h b/android/prefix.h
index 7381620..526e023 100644
--- a/android/prefix.h
+++ b/android/prefix.h
@@ -61,10 +61,6 @@ inline size_t abs(size_t x) { return x; }
// needed for sockaddr_in
#include <netinet/in.h>
-// The following header generated by a makefile rule to determine if
-// we have the internal autofill header or not present in this checkout.
-#include "HaveAutofillInternal.h"
-
// Implemented in bionic but not exposed.
extern char* mkdtemp(char* path);