Revert "build: Add chromium prebuilt support to envsetup.sh && The core Makefile"

This reverts commit 56d96ae8.

Conflicts:
	core/Makefile

core/Makefile

@@ -1572,6 +1572,7 @@ bacon: otapackage
 ifneq ($(TARGET_CUSTOM_RELEASETOOL),)
        $(error TARGET_CUSTOM_RELEASETOOL is deprecated)
 endif
+<<<<<<< HEAD
 	$(hide) ln -f $(INTERNAL_OTA_PACKAGE_TARGET) $(SCREWD_TARGET_PACKAGE)
 	$(hide) $(MD5SUM) $(SCREWD_TARGET_PACKAGE) > $(SCREWD_TARGET_PACKAGE).md5sum
 ifeq ($(USE_PREBUILT_CHROMIUM),1)
@@ -1581,6 +1582,11 @@ ifneq ($(PRODUCT_PREBUILT_WEBVIEWCHROMIUM),yes)
 endif
 endif
 	@echo -e ${CL_CYN}"Package Complete: $(SCREWD_TARGET_PACKAGE)"${CL_RST}
+=======
+       $(hide) ln -f $(INTERNAL_OTA_PACKAGE_TARGET) $(PA_TARGET_PACKAGE)
+       $(hide) $(MD5SUM) $(PA_TARGET_PACKAGE) > $(PA_TARGET_PACKAGE).md5sum
+       @echo -e ${CL_CYN}"Package Complete: $(PA_TARGET_PACKAGE)"${CL_RST}
+>>>>>>> parent of 56d96ae... build: Add chromium prebuilt support to envsetup.sh && The core Makefile
 
 endif    # recovery_fstab is defined
 endif    # TARGET_NO_KERNEL != true

envsetup.sh

@@ -579,18 +579,10 @@ function lunch()
 
     echo
 
-    if [[ $USE_PREBUILT_CHROMIUM -eq 1 ]]; then
-        chromium_prebuilt
-    else
-        # Unset flag in case user opts out later on
-        export PRODUCT_PREBUILT_WEBVIEWCHROMIUM=""
-    fi
-
     fixup_common_out_dir
 
     set_stuff_for_environment
     printconfig
-
 }
 
 # Tab completion for lunch.
@@ -1863,19 +1855,7 @@ function make()
     return $ret
 }
 
-function chromium_prebuilt() {
-    T=$(gettop)
-    export TARGET_DEVICE=$(get_build_var TARGET_DEVICE)
-    hash=$T/prebuilts/chromium/$TARGET_DEVICE/hash.txt
 
-    if [ -r $hash ] && [ $(git --git-dir=$T/external/chromium/.git --work-tree=$T/external/chromium rev-parse --verify HEAD) == $(cat $hash) ]; then
-        export PRODUCT_PREBUILT_WEBVIEWCHROMIUM=yes
-        echo "** Prebuilt Chromium is up-to-date; Will be used for build **"
-    else
-        export PRODUCT_PREBUILT_WEBVIEWCHROMIUM=no
-        echo "** Prebuilt Chromium out-of-date/not found; Will build from source **"
-    fi
-}
 
 if [ "x$SHELL" != "x/bin/bash" ]; then
     case `ps -o command -p $$` in