1.1 --- a/make/windows/create_obj_files.sh Wed Oct 14 16:43:13 2020 +0800 1.2 +++ b/make/windows/create_obj_files.sh Wed Oct 14 17:44:48 2020 +0800 1.3 @@ -57,8 +57,8 @@ 1.4 COMMONSRC=${WorkSpace}/${COMMONSRC_REL} 1.5 ALTSRC=${WorkSpace}/${ALTSRC_REL} 1.6 1.7 -BASE_PATHS="`if [ -d ${ALTSRC}/share/vm ]; then $FIND ${ALTSRC}/share/vm ! -name vm -prune -type d \! \( -name adlc -o -name c1 -o -name gc_implementation -o -name opto -o -name shark -o -name libadt \); fi`" 1.8 -BASE_PATHS="${BASE_PATHS} ` $FIND ${COMMONSRC}/share/vm ! -name vm -prune -type d \! \( -name adlc -o -name c1 -o -name gc_implementation -o -name opto -o -name shark -o -name libadt \)`" 1.9 +BASE_PATHS="`if [ -d ${ALTSRC}/share/vm ]; then $FIND ${ALTSRC}/share/vm ! -name vm -prune -type d \! \( -name adlc -o -name c1 -o -name gc_implementation -o -name opto -o -name shark -o -name libadt -o -name jfr \); fi`" 1.10 +BASE_PATHS="${BASE_PATHS} ` $FIND ${COMMONSRC}/share/vm ! -name vm -prune -type d \! \( -name adlc -o -name c1 -o -name gc_implementation -o -name opto -o -name shark -o -name libadt -o -name jfr \)`" 1.11 1.12 for sd in \ 1.13 share/vm/gc_implementation/shared \ 1.14 @@ -71,10 +71,10 @@ 1.15 BASE_PATHS="${BASE_PATHS} ${COMMONSRC}/${sd}" 1.16 done 1.17 1.18 -BASE_PATHS="${BASE_PATHS} ${GENERATED}/jvmtifiles ${GENERATED}/tracefiles" 1.19 +BASE_PATHS="${BASE_PATHS} ${GENERATED}/jvmtifiles ${GENERATED}/jfrfiles" 1.20 1.21 -if [ -d "${ALTSRC}/share/vm/jfr/buffers" ]; then 1.22 - BASE_PATHS="${BASE_PATHS} ${ALTSRC}/share/vm/jfr/buffers" 1.23 +if [ "$ENABLE_JFR" = "true" ]; then 1.24 +BASE_PATHS="${BASE_PATHS} `$FIND ${COMMONSRC}/share/vm/jfr -type d`" 1.25 fi 1.26 1.27 BASE_PATHS="${BASE_PATHS} ${COMMONSRC}/share/vm/prims/wbtestmethods"