Merge "Docs: replacing analytics ID from D.A.C. Bug: 11476435"
diff --git a/core/64_bit_blacklist.mk b/core/64_bit_blacklist.mk
index 0171e67..9f16536 100644
--- a/core/64_bit_blacklist.mk
+++ b/core/64_bit_blacklist.mk
@@ -16,8 +16,6 @@
# misc build errors
_64_bit_directory_blacklist += \
- external/oprofile/daemon \
- external/oprofile/opcontrol \
frameworks/av \
frameworks/base \
device/generic/goldfish/opengl \
diff --git a/envsetup.sh b/envsetup.sh
index d3bfe80..ba4f683 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -191,10 +191,6 @@
unset ANDROID_HOST_OUT
export ANDROID_HOST_OUT=$(get_abs_build_var HOST_OUT)
- # needed for processing samples collected by perf counters
- unset OPROFILE_EVENTS_DIR
- export OPROFILE_EVENTS_DIR=$T/external/oprofile/events
-
# needed for building linux on MacOS
# TODO: fix the path
#export HOST_EXTRACFLAGS="-I "$T/system/kernel_headers/host_include