Merge "Remove code to detect if we have the private autofill header"

2 files changed, 0 insertions, 83 deletions

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);