Side by Side Diff: Makefile
Issue 29493555:
Issue 5433 - rename v8.gypi to build-v8.gyp (Closed)
Base URL: https://github.com/adblockplus/libadblockplus.git
Patch Set:
Created July 20, 2017, 9:14 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
android-v8-options.gypi » ('j')
|
no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| 1 V8_DIR :=$(shell pwd -L)/third_party/v8/ | 1 V8_DIR :=$(shell pwd -L)/third_party/v8/ |
| 2 HOST_ARCH :=$(shell python ${V8_DIR}gypfiles/detect_v8_host_arch.py) | 2 HOST_ARCH :=$(shell python ${V8_DIR}gypfiles/detect_v8_host_arch.py) |
| 3 | 3 |
| 4 GYP_PARAMETERS=host_arch=${HOST_ARCH} | 4 GYP_PARAMETERS=host_arch=${HOST_ARCH} |
| 5 | 5 |
| 6 ifndef HOST_OS | 6 ifndef HOST_OS |
| 7 raw_OS = $(shell uname -s) | 7 raw_OS = $(shell uname -s) |
| 8 ifeq (${raw_OS},Linux) | 8 ifeq (${raw_OS},Linux) |
| 9 HOST_OS=linux | 9 HOST_OS=linux |
| 10 else ifeq (${raw_OS},Darwin) | 10 else ifeq (${raw_OS},Darwin) |
| (...skipping 24 matching lines...) Expand all Loading... | |
| 35 | 35 |
| 36 .PHONY: all test clean docs v8 v8_android_multi android_multi android_x86 \ | 36 .PHONY: all test clean docs v8 v8_android_multi android_multi android_x86 \ |
| 37 android_arm ensure_dependencies | 37 android_arm ensure_dependencies |
| 38 | 38 |
| 39 .DEFAULT_GOAL:=all | 39 .DEFAULT_GOAL:=all |
| 40 | 40 |
| 41 ensure_dependencies: | 41 ensure_dependencies: |
| 42 python ensure_dependencies.py | 42 python ensure_dependencies.py |
| 43 | 43 |
| 44 v8: ensure_dependencies | 44 v8: ensure_dependencies |
| 45 » GYP_DEFINES="${GYP_PARAMETERS}" third_party/gyp/gyp --depth=. -f make -I v8.gypi --generator-output=build/v8 ${V8_DIR}src/v8.gyp | 45 » GYP_DEFINES="${GYP_PARAMETERS}" third_party/gyp/gyp --depth=. -f make -I build-v8.gypi --generator-output=build/v8 ${V8_DIR}src/v8.gyp |
| 46 make -C build/v8 v8_snapshot v8_libplatform v8_libsampler | 46 make -C build/v8 v8_snapshot v8_libplatform v8_libsampler |
| 47 | 47 |
| 48 all: v8 | 48 all: v8 |
| 49 GYP_DEFINES="${GYP_PARAMETERS}" third_party/gyp/gyp --depth=. -f make -I libadblockplus.gypi --generator-output=build libadblockplus.gyp | 49 GYP_DEFINES="${GYP_PARAMETERS}" third_party/gyp/gyp --depth=. -f make -I libadblockplus.gypi --generator-output=build libadblockplus.gyp |
| 50 $(MAKE) -C build | 50 $(MAKE) -C build |
| 51 | 51 |
| 52 test: all | 52 test: all |
| 53 ifdef FILTER | 53 ifdef FILTER |
| 54 $(TEST_EXECUTABLE) --gtest_filter=$(FILTER) | 54 $(TEST_EXECUTABLE) --gtest_filter=$(FILTER) |
| 55 else | 55 else |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 101 BUILDTYPE=Release \ | 101 BUILDTYPE=Release \ |
| 102 APP_ABI=$(ANDROID_ABI) \ | 102 APP_ABI=$(ANDROID_ABI) \ |
| 103 APP_PLATFORM=android-9 \ | 103 APP_PLATFORM=android-9 \ |
| 104 APP_STL=c++_static \ | 104 APP_STL=c++_static \ |
| 105 APP_BUILD_SCRIPT=Makefile \ | 105 APP_BUILD_SCRIPT=Makefile \ |
| 106 NDK_PROJECT_PATH=. \ | 106 NDK_PROJECT_PATH=. \ |
| 107 NDK_OUT=. \ | 107 NDK_OUT=. \ |
| 108 NDK_APP_DST_DIR=$(ANDROID_DEST_DIR) | 108 NDK_APP_DST_DIR=$(ANDROID_DEST_DIR) |
| 109 endif | 109 endif |
| 110 | 110 |
| OLD | NEW |
« no previous file with comments
|
« no previous file
|
android-v8-options.gypi » ('j')
|
no next file with comments »
