build
Revision | 1ec845dc03e32fbaf87ee9bcbd174762d163e371 (tree) |
---|---|
Zeit | 2014-08-27 19:37:06 |
Autor | Jerome Pilliet <pilliet@univ...> |
Commiter | Chih-Wei Huang |
Some changes added to compile and run with Java 6 and Java 7.
Change-Id: Ib814ede143f7799ef18e0fb1b733547519b8b0e5
@@ -10,9 +10,9 @@ | ||
10 | 10 | # Whatever compiler is on this system. |
11 | 11 | ifeq ($(BUILD_OS), windows) |
12 | 12 | COMMON_JAVAC := development/host/windows/prebuilt/javawrap.exe -J-Xmx256m \ |
13 | - -target 1.5 -Xmaxerrs 9999999 | |
13 | + -target 1.5 -source 1.5 -Xmaxerrs 9999999 | |
14 | 14 | else |
15 | - COMMON_JAVAC := javac -J-Xmx512M -target 1.5 -Xmaxerrs 9999999 | |
15 | + COMMON_JAVAC := javac -J-Xmx512M -target 1.5 -source 1.5 -Xmaxerrs 9999999 | |
16 | 16 | endif |
17 | 17 | |
18 | 18 | # Eclipse. |
@@ -26,7 +26,7 @@ endif | ||
26 | 26 | ifeq ($(CUSTOM_JAVA_COMPILER), openjdk) |
27 | 27 | # We set the VM options (like -Xmx) in the javac script. |
28 | 28 | COMMON_JAVAC := prebuilt/common/openjdk/bin/javac -target 1.5 \ |
29 | - -Xmaxerrs 9999999 | |
29 | + -source 1.5 -Xmaxerrs 9999999 | |
30 | 30 | $(info CUSTOM_JAVA_COMPILER=openjdk) |
31 | 31 | endif |
32 | 32 |
@@ -161,6 +161,9 @@ $(full_target): $(full_src_files) $(droiddoc_templates) $(droiddoc) $(html_dir_f | ||
161 | 161 | $(call prepare-doc-source-list,$(PRIVATE_SRC_LIST_FILE),$(PRIVATE_JAVA_FILES), \ |
162 | 162 | $(PRIVATE_SOURCE_INTERMEDIATES_DIR) $(PRIVATE_ADDITIONAL_JAVA_DIR)) |
163 | 163 | $(hide) ( \ |
164 | + head -1 $(PRIVATE_SRC_LIST_FILE) | tr " " "\n" | sort | uniq | tr "\n" " " > $(PRIVATE_SRC_LIST_FILE)_temp; \ | |
165 | + cat $(PRIVATE_SRC_LIST_FILE) | sed '1 d' >> $(PRIVATE_SRC_LIST_FILE)_temp; \ | |
166 | + mv $(PRIVATE_SRC_LIST_FILE)_temp $(PRIVATE_SRC_LIST_FILE); \ | |
164 | 167 | javadoc \ |
165 | 168 | \@$(PRIVATE_SRC_LIST_FILE) \ |
166 | 169 | -J-Xmx1280m \ |
@@ -194,6 +197,9 @@ $(full_target): $(full_src_files) $(full_java_lib_deps) | ||
194 | 197 | $(call prepare-doc-source-list,$(PRIVATE_SRC_LIST_FILE),$(PRIVATE_JAVA_FILES), \ |
195 | 198 | $(PRIVATE_SOURCE_INTERMEDIATES_DIR) $(PRIVATE_ADDITIONAL_JAVA_DIR)) |
196 | 199 | $(hide) ( \ |
200 | + head -1 $(PRIVATE_SRC_LIST_FILE) | tr " " "\n" | sort | uniq | tr "\n" " " > $(PRIVATE_SRC_LIST_FILE)_temp; \ | |
201 | + cat $(PRIVATE_SRC_LIST_FILE) | sed '1 d' >> $(PRIVATE_SRC_LIST_FILE)_temp; \ | |
202 | + mv $(PRIVATE_SRC_LIST_FILE)_temp $(PRIVATE_SRC_LIST_FILE); \ | |
197 | 203 | javadoc \ |
198 | 204 | $(PRIVATE_DROIDDOC_OPTIONS) \ |
199 | 205 | \@$(PRIVATE_SRC_LIST_FILE) \ |
@@ -153,14 +153,14 @@ $(error stop) | ||
153 | 153 | endif |
154 | 154 | |
155 | 155 | # Check for the correct version of java |
156 | -java_version := $(shell java -version 2>&1 | head -n 1 | grep '^java .*[ "]1\.6[\. "$$]') | |
156 | +java_version := $(shell java -version 2>&1 | head -n 1 | grep '^java .*[ "]1\.[67][\. "$$]') | |
157 | 157 | ifeq ($(strip $(java_version)),) |
158 | 158 | $(info ************************************************************) |
159 | 159 | $(info You are attempting to build with the incorrect version) |
160 | 160 | $(info of java.) |
161 | 161 | $(info $(space)) |
162 | 162 | $(info Your version is: $(shell java -version 2>&1 | head -n 1).) |
163 | -$(info The correct version is: Java SE 1.6.) | |
163 | +$(info The correct version is: Java SE 1.6 or 1.7.) | |
164 | 164 | $(info $(space)) |
165 | 165 | $(info Please follow the machine setup instructions at) |
166 | 166 | $(info $(space)$(space)$(space)$(space)https://source.android.com/source/download.html) |
@@ -169,14 +169,14 @@ $(error stop) | ||
169 | 169 | endif |
170 | 170 | |
171 | 171 | # Check for the correct version of javac |
172 | -javac_version := $(shell javac -version 2>&1 | head -n 1 | grep '[ "]1\.6[\. "$$]') | |
172 | +javac_version := $(shell javac -version 2>&1 | head -n 1 | grep '[ "]1\.[67][\. "$$]') | |
173 | 173 | ifeq ($(strip $(javac_version)),) |
174 | 174 | $(info ************************************************************) |
175 | 175 | $(info You are attempting to build with the incorrect version) |
176 | 176 | $(info of javac.) |
177 | 177 | $(info $(space)) |
178 | 178 | $(info Your version is: $(shell javac -version 2>&1 | head -n 1).) |
179 | -$(info The correct version is: 1.6.) | |
179 | +$(info The correct version is: 1.6 or 1.7.) | |
180 | 180 | $(info $(space)) |
181 | 181 | $(info Please follow the machine setup instructions at) |
182 | 182 | $(info $(space)$(space)$(space)$(space)https://source.android.com/source/download.html) |