Skip to content

Commit

Permalink
remove make_hacks that has been fixed but should no longer be done
Browse files Browse the repository at this point in the history
Intel Houdini dates back from the nexus player...
Wait nexus player is Android 5.0 thus supported by nova (API21)
  • Loading branch information
courville committed Jan 8, 2024
1 parent 850acce commit feae3c7
Showing 1 changed file with 0 additions and 16 deletions.
16 changes: 0 additions & 16 deletions core.mk
Original file line number Diff line number Diff line change
Expand Up @@ -250,21 +250,6 @@ define cp_ffmpeg_libs
fi
endef

define make_hacks
@if [ "$(ASAN)" != "1" ] && [ "$(NDK_CPU_X86)" = "1" ]; then \
echo -----------------------------------------; \
echo -----------------------------------------; \
echo create fake _no_neon libs in $(1)/libs/x86 because Intel wants to see the exact same number of ARM and x86 libs otherwise it will Houdini us; \
echo -----------------------------------------; \
echo -----------------------------------------; \
rm -f $(1)/libs/x86/*no_neon*;\
for i in $(1)/libs/armeabi-v7a/*;do \
touch $(1)/libs/x86/$$(basename $$i) ;\
done ;\
if [ "$$(ls $(1)/libs/x86 |wc -l)" != "$$(ls $(1)/libs/armeabi-v7a |wc -l)" ];then echo "Mismatching x86/armeabi-v7a libs"; 1;fi ;\
fi
endef

define make_avos
MAKE_JOBS=$(MAKE_JOBS) BUILD=$(BUILD) $(ndk_debug) NDK_APP_ABI="$(NDK_APP_ABI)" LIBAV_CONFIG=$(2) make native_build_native/avos

Expand All @@ -289,7 +274,6 @@ define make_avos
mkdir -p $(1)/libs/x86_64; \
cp -r $(AVOS_DIR)/libs/x86_64/*so $(1)/libs/x86_64; \
fi
$(call make_hacks,$(1),$(2))
endef

native_avos: native_build_native/avos
Expand Down

0 comments on commit feae3c7

Please sign in to comment.