Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1149)

Unified Diff: source/data/makedata.mak

Issue 1637683002: ICU 56 step 5: Apply the remaining local patches (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/icu.git@56post56
Patch Set: drop uconv.patch Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « source/data/brkitr/zh_Hant.txt ('k') | source/stubdata/stubdata.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/data/makedata.mak
diff --git a/source/data/makedata.mak b/source/data/makedata.mak
index 9246834ccd2c34da8b27c3f9774a52f59702aeea..d9f955390a80dbe3b6564eeca75e4b4b4e898190 100644
--- a/source/data/makedata.mak
+++ b/source/data/makedata.mak
@@ -500,7 +500,7 @@ COMMON_ICUDATA_ARGUMENTS=-f -e $(U_ICUDATA_NAME) -v $(ICU_PACKAGE_MODE) -c -p $(
# Building the common dll in $(ICUBLD_PKG) unconditionally copies it to $(DLL_OUTPUT) too.
#
#############################################################################
-ALL : GODATA "$(ICU_LIB_TARGET)" "$(TESTDATAOUT)\testdata.dat"
+ALL : GODATA "$(ICU_LIB_TARGET)"
@echo All targets are up to date
# The core Unicode properties files (uprops.icu, ucase.icu, ubidi.icu)
@@ -619,6 +619,7 @@ icu4j-data-install :
cd "$(ICUBLD_PKG)"
"$(ICUPBIN)\icupkg" -x * --list "$(ICUDATA_SOURCE_ARCHIVE)" > "$(ICUTMP)\icudata.lst"
"$(ICUPBIN)\pkgdata" $(COMMON_ICUDATA_ARGUMENTS) "$(ICUTMP)\icudata.lst"
+ editbin /NXCOMPAT /DYNAMICBASE "$(U_ICUDATA_NAME).dll"
copy "$(U_ICUDATA_NAME).dll" "$(DLL_OUTPUT)"
-@erase "$(U_ICUDATA_NAME).dll"
copy "$(ICUTMP)\$(ICUPKG).dat" "$(ICUOUT)\$(U_ICUDATA_NAME)$(U_ICUDATA_ENDIAN_SUFFIX).dat"
« no previous file with comments | « source/data/brkitr/zh_Hant.txt ('k') | source/stubdata/stubdata.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698