Merge changes from topic 'no-bionic-prebuilts'

* changes:
  Build the versioner even on unbundled branches.
  Revert "Revert "Run the versioner as part of the build.""

PREUPLOAD.cfg

@@ -1,3 +1,2 @@
 [Hook Scripts]
-versioner = tools/versioner/preupload.sh
 notice = tools/update_notice.sh

libc/Android.bp

@@ -2036,15 +2036,12 @@ cc_object {
     defaults: ["crt_defaults"],
 }
 
-// The following module lives in prebuilts/ndk because we need to preprocess the
-// headers to include ifdef guards for __ANDROID_API__. Update with
-// bionic/tools/update_headers.sh.
-// ndk_headers {
-//     name: "common_libc",
-//     from: "include",
-//     to: "",
-//     srcs: ["include/**/*.h"],
-// }
+preprocessed_ndk_headers {
+    name: "common_libc",
+    from: "include",
+    to: "",
+    license: "NOTICE",
+}
 
 ndk_headers {
     name: "libc_uapi",

libc/versioner-dependencies/arm/arch-arm

@@ -0,0 +1 @@
+../../arch-arm/include/

libc/versioner-dependencies/arm/kernel_uapi_asm-arm

@@ -0,0 +1 @@
+../../kernel/uapi/asm-arm

libc/versioner-dependencies/arm64/arch-arm64

@@ -0,0 +1 @@
+../../arch-arm64/include/

libc/versioner-dependencies/arm64/kernel_uapi_asm-arm64

@@ -0,0 +1 @@
+../../kernel/uapi/asm-arm64

libc/versioner-dependencies/common/clang-builtins

@@ -0,0 +1 @@
+../../../../external/clang/lib/Headers/

libc/versioner-dependencies/common/kernel_android_uapi

@@ -0,0 +1 @@
+../../kernel/android/uapi/

libc/versioner-dependencies/common/kernel_uapi

@@ -0,0 +1 @@
+../../kernel/uapi/

libc/versioner-dependencies/mips/arch-mips

@@ -0,0 +1 @@
+../../arch-mips/include/

libc/versioner-dependencies/mips/kernel_uapi_asm-mips

@@ -0,0 +1 @@
+../../kernel/uapi/asm-mips

libc/versioner-dependencies/mips64/arch-mips64

@@ -0,0 +1 @@
+../../arch-mips64/include/

libc/versioner-dependencies/mips64/kernel_uapi_asm-mips

@@ -0,0 +1 @@
+../../kernel/uapi/asm-mips

libc/versioner-dependencies/x86/arch-x86

@@ -0,0 +1 @@
+../../arch-x86/include/

libc/versioner-dependencies/x86/kernel_uapi_asm-x86

@@ -0,0 +1 @@
+../../kernel/uapi/asm-x86/

libc/versioner-dependencies/x86_64/arch-x86_64

@@ -0,0 +1 @@
+../../arch-x86_64/include/

libc/versioner-dependencies/x86_64/kernel_uapi_asm-x86

@@ -0,0 +1 @@
+../../kernel/uapi/asm-x86/

tools/update_headers.sh

@@ -1,53 +0,0 @@
-#!/bin/bash
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-cd $DIR
-
-which versioner >/dev/null 2>&1
-if [ $? -ne 0 ]; then
-  >&2 echo "versioner not in path; run mma in $DIR/versioner"
-  exit 1
-fi
-
-VERSION=$(git rev-parse --short HEAD)
-git diff-index --quiet HEAD
-DIRTY=$?
-git branch -r --contains HEAD | grep -q aosp/master
-SUBMITTED=$?
-
-if [ $DIRTY -ne 0 ]; then
-  >&2 echo "Warning: bionic has uncommitted changes"
-  VERSION="${VERSION}-dirty"
-elif [ $SUBMITTED -ne 0 ]; then
-  >&2 echo "Warning: current HEAD does not exist in aosp/master"
-  VERSION="${VERSION}-unsubmitted"
-fi
-
-PREBUILTS_DIR=$ANDROID_BUILD_TOP/prebuilts/ndk
-BRANCH_NAME=$(git -C $PREBUILTS_DIR symbolic-ref --short -q HEAD)
-if [ $? -ne 0 ]; then
-  BRANCH_NAME=update-bionic-headers-$VERSION
-  echo "prebuilts/ndk has detached head; creating branch $BRANCH_NAME"
-  repo start $BRANCH_NAME $PREBUILTS_DIR
-else
-  echo "prebuilts/ndk already on branch $BRANCH_NAME"
-fi
-
-HEADERS_INSTALL=$PREBUILTS_DIR/headers
-if [ -d "$HEADERS_INSTALL" ]; then
-  git -C $PREBUILTS_DIR rm -r --ignore-unmatch $HEADERS_INSTALL
-  if [ -d $HEADERS_INSTALL ]; then
-    rm -r $HEADERS_INSTALL
-  fi
-fi
-
-versioner -p versioner/platforms versioner/current versioner/dependencies \
-  -o $HEADERS_INSTALL
-if [ $? -ne 0 ]; then
-  >&2 echo "Header preprocessing failed"
-  exit 1
-fi
-
-cp ../libc/NOTICE $PREBUILTS_DIR
-
-git -C $PREBUILTS_DIR add $HEADERS_INSTALL $PREBUILTS_DIR/NOTICE
-git -C $PREBUILTS_DIR commit -m "Update bionic headers to $VERSION."

tools/versioner/dependencies/arm/arch-arm

@@ -1 +0,0 @@
-../../../../libc/arch-arm/include

tools/versioner/dependencies/arm/kernel_uapi_asm-arm

@@ -1 +0,0 @@
-../../../../libc/kernel/uapi/asm-arm

tools/versioner/dependencies/arm64/arch-arm64

@@ -1 +0,0 @@
-../../../../libc/arch-arm64/include

tools/versioner/dependencies/arm64/kernel_uapi_asm-arm64

@@ -1 +0,0 @@
-../../../../libc/kernel/uapi/asm-arm64

tools/versioner/dependencies/common/clang-builtins

@@ -1 +0,0 @@
-../../../../../external/clang/lib/Headers

tools/versioner/dependencies/common/kernel_android_uapi

@@ -1 +0,0 @@
-../../../../libc/kernel/android/uapi

tools/versioner/dependencies/common/kernel_uapi

@@ -1 +0,0 @@
-../../../../libc/kernel/uapi

tools/versioner/dependencies/mips/arch-mips

@@ -1 +0,0 @@
-../../../../libc/arch-mips/include

tools/versioner/dependencies/mips/kernel_uapi_asm-mips

@@ -1 +0,0 @@
-../../../../libc/kernel/uapi/asm-mips

tools/versioner/dependencies/mips64/arch-mips64

@@ -1 +0,0 @@
-../../../../libc/arch-mips64/include

tools/versioner/dependencies/mips64/kernel_uapi_asm-mips

@@ -1 +0,0 @@
-../../../../libc/kernel/uapi/asm-mips

tools/versioner/dependencies/x86/arch-x86

@@ -1 +0,0 @@
-../../../../libc/arch-x86/include

tools/versioner/dependencies/x86/kernel_uapi_asm-x86

@@ -1 +0,0 @@
-../../../../libc/kernel/uapi/asm-x86

tools/versioner/dependencies/x86_64/arch-x86_64

@@ -1 +0,0 @@
-../../../../libc/arch-x86_64/include

tools/versioner/dependencies/x86_64/kernel_uapi_asm-x86

@@ -1 +0,0 @@
-../../../../libc/kernel/uapi/asm-x86

tools/versioner/preupload.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-if ! which versioner > /dev/null; then
-  echo "versioner not found (lunch and mma in bionic)"
-  exit 1
-fi
-
-versioner -r arm -r arm64
-exit $?

tools/versioner/src/Android.bp

@@ -41,18 +41,8 @@ cc_binary_host {
                 "-fno-rtti",
             ],
         },
-        darwin: {
-            enabled: false,
-        },
         windows: {
             enabled: false,
         },
     },
-
-    product_variables: {
-        unbundled_build: {
-            // Only do this when Clang is available.
-            enabled: false,
-        },
-    },
 }